Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CI] Remove libatomic_ops #11598

Merged
merged 6 commits into from
Dec 21, 2021
Merged

[CI] Remove libatomic_ops #11598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1564869
[CI] Remove `libatomic_ops`
straight-shoota Oct 1, 2021
451b614
Fix download hash
straight-shoota Dec 15, 2021
aa99486
Win-CI build with `-Dwithout_libatomic_ops=ON`
straight-shoota Dec 16, 2021
4343ede
Fix download hash
straight-shoota Dec 16, 2021
cfab0a1
fixup! Win-CI build with `-Dwithout_libatomic_ops=ON`
straight-shoota Dec 16, 2021
ef780ed
Re-add libatomic ops for windows CI
straight-shoota Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
- run: |
git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts
cd ~/distribution-scripts
git checkout 638d5887e7a4bff9c32ab72fe9a32395df9dc1c5
git checkout 8328ae59292c05cf8c830a34b5b39ac46c43813e
# persist relevant information for build process
- run: |
cd ~/distribution-scripts
Expand Down
21 changes: 2 additions & 19 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,32 +87,15 @@ let
};
}."llvm_${toString llvm}");

libatomic_ops = builtins.fetchurl {
url = "https://github.com/ivmai/libatomic_ops/releases/download/v7.6.10/libatomic_ops-7.6.10.tar.gz";
sha256 = "1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq";
};

boehmgc = pkgs.stdenv.mkDerivation rec {
pname = "boehm-gc";
version = "8.0.4";
version = "8.2.0";

src = builtins.fetchTarball {
url = "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz";
sha256 = "16ic5dwfw51r5lcl88vx3qrkg3g2iynblazkri3sl9brnqiyzjk7";
sha256 = "0f3m27sfc4wssdvk32vivdg64b04ydw0slxm45zdv23qddrihxq4";
};

patches = [
(pkgs.fetchpatch {
url = "https://github.com/ivmai/bdwgc/commit/5668de71107022a316ee967162bc16c10754b9ce.patch";
sha256 = "02f0rlxl4fsqk1xiq0pabkhwydnmyiqdik2llygkc6ixhxbii8xw";
})
];

postUnpack = ''
mkdir $sourceRoot/libatomic_ops
tar -xzf ${libatomic_ops} -C $sourceRoot/libatomic_ops --strip-components 1
'';

configureFlags = [
"--disable-debug"
"--disable-dependency-tracking"
Expand Down