nix: update nixpkgs to the latest & using node20 by default (#2001)

* nix: update nixpkgs to the latest * tasks/check-changeset.sh renamed * ci.feature: cancel concurrent workflows * run lcov ignoring inconsistent errors
superfluid-finance · Aug 8, 2024 · 029035e · 029035e
1 parent b9cd188
commit 029035e
Show file tree

Hide file tree

Showing 22 changed files with 196 additions and 172 deletions.
diff --git a/.github/workflows/call.check-query-schema-against-subgraph.yml b/.github/workflows/call.check-query-schema-against-subgraph.yml
@@ -18,7 +18,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-default -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/call.deploy-subgraph.yml b/.github/workflows/call.deploy-subgraph.yml
@@ -64,7 +64,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash {0}
+        shell: nix develop .#ci-default -c bash {0}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/call.test-local-subgraph.yml b/.github/workflows/call.test-local-subgraph.yml
@@ -13,7 +13,8 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        # FIXME: subgraph test fails with node20
+        shell: nix develop .#ci-node18 -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4
@@ -59,7 +60,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-node18 -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/call.test-sdk-core.yml b/.github/workflows/call.test-sdk-core.yml
@@ -26,7 +26,8 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        # FIXME: subgraph test fails with node20
+        shell: nix develop .#ci-node18 -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/call.test-solidity-semantic-money.yml b/.github/workflows/call.test-solidity-semantic-money.yml
@@ -11,7 +11,7 @@ jobs:
 
     defaults:
      run:
-       shell: nix develop . -c bash -xe {0}
+       shell: nix develop .#ci-default -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/call.test-subgraph-on-previous-sdk-core-versions.yml b/.github/workflows/call.test-subgraph-on-previous-sdk-core-versions.yml
@@ -30,7 +30,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-default -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/call.upload-coverage-reports.yml b/.github/workflows/call.upload-coverage-reports.yml
@@ -21,7 +21,7 @@ jobs:
           name: ethereum-contracts-coverage
           path: packages/ethereum-contracts/coverage
       - name: Upload ethereum-contracts-coverage to codecov
-        uses: codecov/codecov-action@v4.2.0
+        uses: codecov/codecov-action@v4.3.0
         with:
           token: ${{ secrets.codecov_token }}
           files: packages/ethereum-contracts/coverage/lcov.info

diff --git a/.github/workflows/cd.feature.create-pr-artifact.yml b/.github/workflows/cd.feature.create-pr-artifact.yml
@@ -12,7 +12,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-default -c bash -xe {0}
 
     if: ${{ !github.event.pull_request.draft }}
 
@@ -41,8 +41,8 @@ jobs:
           echo "  .locked" ${{ github.event.pull_request.locked }}
           echo "  .draft" ${{ github.event.pull_request.draft }}
 
-      - name: Check changeset
-        run: tasks/check-changeset.sh ${{ github.sha }} dev
+      - name: Create build set
+        run: tasks/create-build-set.sh ${{ github.sha }} dev origin
 
       - name: Install dependencies
         if: env.PUBLISH_PR_ARTIFACT == 1

diff --git a/.github/workflows/ci.canary.yml b/.github/workflows/ci.canary.yml
@@ -23,8 +23,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Check changeset
-        run: tasks/check-changeset.sh ${{ github.sha }} dev
+      - name: Create build set
+        run: tasks/create-build-set.sh ${{ github.sha }} dev origin
 
   essential-build-and-test:
     name: Build and test essential packages of dev branch
@@ -179,7 +179,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-default -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4
@@ -223,7 +223,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-default -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4
@@ -288,7 +288,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-default -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/ci.feature.yml b/.github/workflows/ci.feature.yml
@@ -12,6 +12,10 @@ on:
   merge_group:
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check:
     name: Checking what packages need to be built
@@ -59,8 +63,8 @@ jobs:
       - name: Run pre-commit check
         run: npm run pre-commit
 
-      - name: Check changeset
-        run: tasks/check-changeset.sh ${{ github.sha }} dev
+      - name: Create build set
+        run: tasks/create-build-set.sh ${{ github.sha }} dev origin
 
   test-ethereum-contracts:
     name: Test ethereum-contracts (Feature Branch)
@@ -71,7 +75,7 @@ jobs:
       run-coverage-tests: false
 
   coverage-ethereum-contracts:
-    name: Coverage test ethereum-contracts (Feature Branch)
+    name: Coverage Test ethereum-contracts (Feature Branch)
     uses: ./.github/workflows/call.test-ethereum-contracts.yml
     needs: [check]
     if: needs.check.outputs.build_ethereum_contracts
@@ -106,7 +110,7 @@ jobs:
 
   # sdk-core integration test + local subgraph w/ local sdk-core
   test-sdk-core:
-    name: Test SDK-Core (Feature Branch)
+    name: Test sdk-core (Feature Branch)
     uses: ./.github/workflows/call.test-sdk-core.yml
     needs: [check]
     if: needs.check.outputs.build_sdk_core
@@ -116,7 +120,7 @@ jobs:
       run-coverage-tests: false
 
   coverage-sdk-core:
-    name: Test SDK-Core (Feature Branch)
+    name: Coverage Test sdk-core (Feature Branch)
     uses: ./.github/workflows/call.test-sdk-core.yml
     needs: [check]
     if: needs.check.outputs.build_sdk_core

diff --git a/.github/workflows/handler.changelog-reminder.yml b/.github/workflows/handler.changelog-reminder.yml
@@ -19,9 +19,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Check changeset
-        run: tasks/check-changeset.sh ${{ github.sha }} dev
-  
+      - name: Create build set
+        run: tasks/create-build-set.sh ${{ github.sha }} dev origin
+
   create-reminder:
     name: Create Changelog reminder in PR discussion
 
@@ -45,4 +45,4 @@ jobs:
               Reminder to update the CHANGELOG.md for any of the modified packages in this PR.
               - [ ] CHANGELOG.md modified
               - [ ] Double check before merge
-          reactions: white_check_mark
+          reactions: white_check_mark
diff --git a/.github/workflows/handler.deploy-to-mainnet.yml b/.github/workflows/handler.deploy-to-mainnet.yml
@@ -28,7 +28,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-default -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/handler.deploy-to-testnets.yml b/.github/workflows/handler.deploy-to-testnets.yml
@@ -28,7 +28,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-default -c bash -xe {0}
 
     strategy:
       fail-fast: false

diff --git a/.github/workflows/handler.list-super-token.yml b/.github/workflows/handler.list-super-token.yml
@@ -35,7 +35,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-default -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/handler.publish-release-packages.yml b/.github/workflows/handler.publish-release-packages.yml
@@ -14,7 +14,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-default -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/handler.run-ethereum-contracts-script.yml b/.github/workflows/handler.run-ethereum-contracts-script.yml
@@ -30,8 +30,8 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
-  
+        shell: nix develop .#ci-default -c bash -xe {0}
+
     env:
       RELEASE_VERSION: ${{ github.event.inputs.release_version }}
       RESOLVER_ADMIN_TYPE: ${{ github.event.inputs.admin_type }}

diff --git a/.github/workflows/handler.verify-contracts.yml b/.github/workflows/handler.verify-contracts.yml
@@ -28,7 +28,7 @@ jobs:
 
     defaults:
       run:
-        shell: nix develop -c bash -xe {0}
+        shell: nix develop .#ci-default -c bash -xe {0}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -73,7 +73,7 @@
     ];
 
     # minimem development shell
-    minimumDevInputs = commonDevInputs ++ ethDevInputs ++ node18DevInputs;
+    minimumDevInputs = commonDevInputs ++ ethDevInputs ++ node20DevInputs;
 
     # additional tooling for whitehat hackers
     whitehatInputs = with pkgs; [
@@ -113,9 +113,7 @@
       FOUNDRY_OFFLINE = "true";
       FOUNDRY_SOLC_VERSION = pkgs.lib.getExe pkgs.${solcVer};
     } // o);
-
-    # ci-spec-with-ghc
-    ci-spec-with-ghc = ghcVer : mkShell {
+    mkShellForSpecCI = ghcVer : mkShell {
       buildInputs = with pkgs; [
         cabal-install
         haskell.compiler.${ghcVer}
@@ -142,14 +140,17 @@
     };
 
     # CI shells
+    devShells.ci-default = mkShell {
+      buildInputs = ciInputs ++ minimumDevInputs;
+    };
     devShells.ci-node18 = mkShell {
       buildInputs = ciInputs ++ commonDevInputs ++ ethDevInputs ++ node18DevInputs;
     };
     devShells.ci-node20 = mkShell {
       buildInputs = ciInputs ++ commonDevInputs ++ ethDevInputs ++ node20DevInputs;
     };
-    devShells.ci-spec-ghc92 = ci-spec-with-ghc ghcVer92;
-    devShells.ci-spec-ghc94 = ci-spec-with-ghc ghcVer94;
+    devShells.ci-spec-ghc92 = mkShellForSpecCI ghcVer92;
+    devShells.ci-spec-ghc94 = mkShellForSpecCI ghcVer94;
     devShells.ci-hot-fuzz = mkShell {
       buildInputs = with pkgs; ciInputs ++ commonDevInputs ++ ethDevInputs ++ [
         slither-analyzer

diff --git a/packages/ethereum-contracts/tasks/coverage-cleanup.sh b/packages/ethereum-contracts/tasks/coverage-cleanup.sh
@@ -4,13 +4,15 @@ set -ex
 
 cd "$(dirname "$0")"/..
 
+LCOV="lcov --ignore-errors inconsistent"
+
 # extract coverage for Superfluid contracts from forge coverage
-lcov -e ../../lcov.info \
+$LCOV -e ../../lcov.info \
      "packages/ethereum-contracts/contracts/*" \
      -o lcov.info
 
 # remove contracts whose coverage we don't care about (see .solcover.js)
-lcov -r lcov.info \
+$LCOV -r lcov.info \
      "packages/ethereum-contracts/contracts/mocks/*" \
      "packages/ethereum-contracts/contracts/apps/*Base*" \
      "packages/ethereum-contracts/contracts/utils/*Test*" \
@@ -19,6 +21,6 @@ lcov -r lcov.info \
      -o lcov.info
 
 # merge hardhat and forge coverage files
-lcov -a lcov.info \
+$LCOV -a lcov.info \
      -a coverage/lcov.info \
      -o coverage/lcov.info