From 37f621d3e04410b3419fc534222ac3f87fe9531f Mon Sep 17 00:00:00 2001
From: Skylar Simoncelli <128400943+skylar-simoncelli@users.noreply.github.com>
Date: Mon, 13 Jan 2025 15:06:35 +0100
Subject: [PATCH 1/2] fix: reenable devshell-tests CI job

---
 .github/workflows/ci.yml | 60 ++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2f1fdbd86..3cd608ac3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -193,36 +193,36 @@ jobs:
           K8S_SERVER: ${{ secrets.K8S_SERVER }}
           K8S_SA_TOKEN: ${{ secrets.K8S_SA_TOKEN }}
 
-  #devshell-tests:
-  #  needs: build
-  #  strategy:
-  #    matrix:
-  #      os: [nixos, macos]
-  #  runs-on:
-  #    - self-hosted
-  #    - ${{ matrix.os }}
-  #  steps:
-  #    - name: Checkout code
-  #      uses: actions/checkout@v4
-  #      with:
-  #        fetch-depth: 0
-  #        ref: ${{ github.event.pull_request.head.sha || github.sha }}
-  #    - name: Acquire AWS credentials
-  #      uses: aws-actions/configure-aws-credentials@v4
-  #      with:
-  #        role-to-assume: ${{ secrets.AWS_ROLE_ARN_ }}
-  #        aws-region: ${{ env.AWS_REGION }}
-  #    - name: Add signing key for nix
-  #      run: echo "${{ secrets.NIX_SIGNING_KEY }}" > "${{ runner.temp }}/nix-key"
-  #    - name: Run nixci to build/test all outputs
-  #      run: |
-  #        nix run github:srid/nixci -- -v build -- --fallback > /tmp/outputs
-  #    - name: Copy nix scopes to nix cache
-  #      run: |
-  #        nix-store --stdin -q --deriver < /tmp/outputs | nix-store --stdin -qR --include-outputs \
-  #        | nix copy --stdin --to \
-  #        "s3://cache.sc.iog.io?secret-key=${{ runner.temp }}/nix-key&region=$AWS_DEFAULT_REGION" \
-  #        && rm /tmp/outputs
+  devshell-tests:
+    needs: build
+    strategy:
+      matrix:
+        os: [nixos, macos]
+    runs-on:
+      - self-hosted
+      - ${{ matrix.os }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+      - name: Acquire AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_ARN_ }}
+          aws-region: ${{ env.AWS_REGION }}
+      - name: Add signing key for nix
+        run: echo "${{ secrets.NIX_SIGNING_KEY }}" > "${{ runner.temp }}/nix-key"
+      - name: Run nixci to build/test all outputs
+        run: |
+          nix run github:srid/nixci -- -v build -- --fallback > /tmp/outputs
+      - name: Copy nix scopes to nix cache
+        run: |
+          nix-store --stdin -q --deriver < /tmp/outputs | nix-store --stdin -qR --include-outputs \
+          | nix copy --stdin --to \
+          "s3://cache.sc.iog.io?secret-key=${{ runner.temp }}/nix-key&region=$AWS_DEFAULT_REGION" \
+          && rm /tmp/outputs
 
   pre-merge-checks-complete:
     if: ${{ always() && (github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged == false)) }}

From 6cb9a8d48ab5a9e4d47f169807721209eed4960c Mon Sep 17 00:00:00 2001
From: Skylar Simoncelli <128400943+skylar-simoncelli@users.noreply.github.com>
Date: Mon, 13 Jan 2025 15:16:08 +0100
Subject: [PATCH 2/2] fix: needs devshell-tests

---
 .github/workflows/ci.yml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3cd608ac3..ed7af6595 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -226,27 +226,18 @@ jobs:
 
   pre-merge-checks-complete:
     if: ${{ always() && (github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged == false)) }}
-#    needs: [build, local-environment-tests, devshell-tests]
-    needs: [build, local-environment-tests]
+    needs: [build, local-environment-tests, devshell-tests]
     runs-on: ubuntu-latest
     steps:
       - name: Check if any needed job failed
         run: |
-          # if [[ "${{ needs.build.result }}" != "success" ||
-          #       "${{ needs.local-environment-tests.result }}" != "success" ||
-          #       "${{ needs.devshell-tests.result }}" != "success" ]]; then
-          #   echo "One or more needed jobs failed."
-          #   exit 1
-          # else
-          #   echo "All needed jobs passed."
-          # fi
-
           if [[ "${{ needs.build.result }}" != "success" ||
-                "${{ needs.local-environment-tests.result }}" != "success" ]]; then
-            echo "Build or local-environment-tests failed."
+                "${{ needs.local-environment-tests.result }}" != "success" ||
+                "${{ needs.devshell-tests.result }}" != "success" ]]; then
+            echo "One or more needed jobs failed."
             exit 1
           else
-            echo "All required jobs passed."
+            echo "All needed jobs passed."
           fi
 
   upload-chain-specs: