Merge branch 'main' into ODFix

tgstation-operations · Feb 18, 2025 · a801dd7 · a801dd7
2 parents 7a924f1 + a2b2baa
commit a801dd7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/colmena.yml b/.github/workflows/colmena.yml
@@ -77,6 +77,7 @@ jobs:
     needs: build
     if: ${{ github.repository == 'tgstation-operations/infrastructure' && github.ref == 'refs/heads/main' }}
     environment: ${{ matrix.environment }}
+    continue-on-error: true
     strategy:
       matrix:
         runner: [ubuntu-24.04]

diff --git a/modules/base.nix b/modules/base.nix
@@ -22,7 +22,7 @@
     ];
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "tgstation-infrastructure:tNpjd5GxK1xymRHsJdBLTpeDScA2mVPdKA/eIOLOE0I="
+      "tgstation-infrastructure:aaSrfZGLWk7a+RtcX0NaFYkOs6E4QlJ+5MZ8padOt3o="
     ];
     trusted-users = ["@wheel"];
   };