diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8b72ce..f8b0437 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,9 @@ jobs: strategy: matrix: # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners - os: [ubuntu-latest, ubuntu-24.04-arm, macos-14, macos-15, macos-15-intel] + os: [ ubuntu-latest, ubuntu-24.04-arm, ubuntu-26.04 + , macos-latest, macos-14, macos-15, macos-26 + ] fail-fast: false runs-on: ${{ matrix.os }} permissions: diff --git a/flake.lock b/flake.lock index a529864..762922c 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777641297, - "narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=", + "lastModified": 1786348146, + "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0", + "rev": "d482ef84049d9b7276b83a06e4e4d76983830097", "type": "github" }, "original": { @@ -44,13 +44,13 @@ "solc-macos-amd64-list-json": { "flake": false, "locked": { - "narHash": "sha256-zzwwHA2qPotv7yp8mK7+y9BZhm7ytuFeCJVvKBBdBn4=", + "narHash": "sha256-Vfa5XmxKcrBfMdJX3nWo+s0YixtdZND6l4llwNp+Xl0=", "type": "file", - "url": "https://github.com/argotorg/solc-bin/raw/902dfaf/macosx-amd64/list.json" + "url": "https://github.com/argotorg/solc-bin/raw/97e2659/macosx-amd64/list.json" }, "original": { "type": "file", - "url": "https://github.com/argotorg/solc-bin/raw/902dfaf/macosx-amd64/list.json" + "url": "https://github.com/argotorg/solc-bin/raw/97e2659/macosx-amd64/list.json" } }, "systems": { @@ -71,4 +71,4 @@ }, "root": "root", "version": 7 -} \ No newline at end of file +} diff --git a/flake.nix b/flake.nix index e484862..588fd9f 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,6 @@ [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ] ( diff --git a/mk-solc-static-pkg.nix b/mk-solc-static-pkg.nix index 149106c..95a21a8 100644 --- a/mk-solc-static-pkg.nix +++ b/mk-solc-static-pkg.nix @@ -25,7 +25,6 @@ let { x86_64-linux = "solc-static-linux"; aarch64-linux = "solc-static-linux-arm"; - x86_64-darwin = "solc-macos-amd64"; aarch64-darwin = "solc-macos-aarch64"; } # We musnt' throw here, since nixos-rebuild seems not liking it. diff --git a/test/flake.nix b/test/flake.nix index 6b8c5bf..7c3b430 100644 --- a/test/flake.nix +++ b/test/flake.nix @@ -20,7 +20,6 @@ [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ] ( @@ -49,11 +48,6 @@ ] else if system == "aarch64-linux" then [ solc_0_8_31 ] - else if system == "x86_64-darwin" then - [ - solc_0_4_11 - solc_0_7_6 - ] else if system == "aarch64-darwin" then [ solc_0_8_5 ] else