Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
os: [ubuntu-latest, macos-14, macos-15, macos-15-intel]
os: [ubuntu-latest, ubuntu-24.04-arm, macos-14, macos-15, macos-15-intel]
fail-fast: false
runs-on: ${{ matrix.os }}
permissions:
Expand All @@ -31,7 +31,7 @@ jobs:
nix develop .# --command -- bash -c "solc-0.8.33 --version"

# test `nix shell`
nix shell .#solc_0_8_19
nix shell .#solc_0_8_33

# test solc.nix as input to other flakes
# Note: overriding flake input is needed as a workaround to local sub flake with overlapping paths.
Expand Down
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
flake-utils.lib.eachSystem
[
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
]
Expand Down
5 changes: 5 additions & 0 deletions mk-solc-static-pkg.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ let
solc-flavor =
{
x86_64-linux = "solc-static-linux";
aarch64-linux = "solc-static-linux-arm";
x86_64-darwin = "solc-macos-amd64";
aarch64-darwin = "solc-macos-aarch64";
}
Expand All @@ -40,6 +41,10 @@ let
url =
if solc-flavor == "solc-static-linux" then
"https://github.com/argotorg/solidity/releases/download/v${version}/solc-static-linux"
else if
solc-flavor == "solc-static-linux-arm" && builtins.compareVersions solc_ver "0.8.31" > -1
then
"https://github.com/argotorg/solidity/releases/download/v${version}/solc-static-linux-arm"
else if solc-flavor == "solc-macos-amd64" then
macosUniversalBuildUrl
else if solc-flavor == "solc-macos-aarch64" && builtins.compareVersions solc_ver "0.8.5" > -1 then
Expand Down
3 changes: 3 additions & 0 deletions solc-listing.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
version = "0.8.33";
sha256 = {
solc-static-linux = "sha256-EnTlxGIa5HgJDFofSEZv08X2WO2eFLFaCyE9yAYhVGg=";
solc-static-linux-arm = "sha256-njTPuRanW91kGx5wbVOK/p+0RxrmEFqQd+eQigWN+Vk=";
solc-macos-amd64 = "sha256-gyQoBZHOOY1+JyKEa8EOzxd5sToyjvl7aHySzZxwgBo=";
solc-macos-aarch64 = "sha256-gyQoBZHOOY1+JyKEa8EOzxd5sToyjvl7aHySzZxwgBo=";
};
Expand All @@ -11,6 +12,7 @@
version = "0.8.32";
sha256 = {
solc-static-linux = "sha256-qvx+QJoQtmkBDNkyB0dKQ2T7zL5jUQasCcEs0MtHWhs=";
solc-static-linux-arm = "sha256-8miqF9C3cIBs65By/1TIlw/PdKv0+dRP7xG0gx72QUw=";
solc-macos-amd64 = "sha256-X4Z4XrbFCHQPi1eiHKz+cPlfxpUOMMq1aKoNSu+YTjE=";
solc-macos-aarch64 = "sha256-X4Z4XrbFCHQPi1eiHKz+cPlfxpUOMMq1aKoNSu+YTjE=";
};
Expand All @@ -19,6 +21,7 @@
version = "0.8.31";
sha256 = {
solc-static-linux = "sha256-qsnNARbprgzT2PZKhkE4GEXcnxLipSZT3jb7YZMj5Vc=";
solc-static-linux-arm = "sha256-rPNY2C2n2wM967L02xHhyc/LArDLW13buWNa2Be0G90=";
solc-macos-amd64 = "sha256-9aJD1rLdj7owfjbF/votjrOudLqBA20cF8lxtdNGrek=";
solc-macos-aarch64 = "sha256-9aJD1rLdj7owfjbF/votjrOudLqBA20cF8lxtdNGrek=";
};
Expand Down
3 changes: 3 additions & 0 deletions test/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
flake-utils.lib.eachSystem
[
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
]
Expand Down Expand Up @@ -46,6 +47,8 @@
solc_0_7_6
solc_0_8_33
]
else if system == "aarch64-linux" then
[ solc_0_8_31 ]
else if system == "x86_64-darwin" then
[
solc_0_4_11
Expand Down
1 change: 1 addition & 0 deletions utils/create-listing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ print_hash() {
version = "${s#solc-}";
sha256 = {
$(print_hash solc-static-linux "$c"/static-linux/"$s")
$(print_hash solc-static-linux-arm "$c"/static-linux-arm/"$s")
$(print_hash solc-macos-amd64 "$c"/macos-amd64/"$s")
$(print_hash solc-macos-aarch64 "$c"/macos-aarch64/"$s")
};
Expand Down
8 changes: 8 additions & 0 deletions utils/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ download_one_version() {
https://github.com/argotorg/solidity/releases/download/v"$v"/solc-static-linux \
"$T"/bin/static-linux/solc-"$v"

if [ "$(semver compare $v 0.8.30)" == 1 ]; then
# starting from 0.8.31, solidity distribution started to provide linux arm builds
mkdir -p "$T/bin/static-linux-arm"
run_wget \
https://github.com/argotorg/solidity/releases/download/v"$v"/solc-static-linux-arm \
"$T"/bin/static-linux-arm/solc-"$v"
fi

mkdir -p "$T/bin/macos-amd64"
run_wget \
https://binaries.soliditylang.org/macosx-amd64/$(jq -r ".releases.\"$1\"" "$macos_versions") \
Expand Down
Loading