...

Author: FooBarWidget

.github/workflows/ci-cd-main.yml

@@ -32,12 +32,40 @@ env:
   CI_ARTIFACTS_RUN_NUMBER: 329 # ${{ github.event.inputs.ci_artifacts_run_number || github.run_number }}
 
 jobs:
+  test:
+    runs-on: ubuntu-24.04
+    environment: deploy
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/github-script@v7
+        id: get-id-token
+        # if: github.ref == 'refs/heads/main'
+        with:
+          script: |
+            const fs = require('fs');
+            const token = await core.getIDToken('backend.fullstaqruby.org');
+            fs.writeFileSync(
+              process.env.GITHUB_OUTPUT,
+              `id_token<<EOF\n${token}\nEOF\n`,
+              { flag: 'a' }
+            );
+
+      - name: Restart web server
+        run: ./internal-scripts/ci-cd/publish/restart-web-server.rb
+        # if: github.ref == 'refs/heads/main'
+        env:
+          ID_TOKEN: ${{ steps.get-id-token.outputs.id_token }}
+
+      - run: 'false'
+
   # Determines which jobs should be run, or (in case this is a re-run)
   # which jobs can be skipped this time because the last run succeeded.
   # We determine this by checking whether the artifacts produced by jobs
   # exist in this run.
   determine_necessary_jobs:
     name: Determine necessary jobs
+    needs: test
     runs-on: ubuntu-24.04
     environment: test
     permissions:

.github/workflows/ci-cd-main.yml.erb

@@ -22,12 +22,40 @@ env:
   CI_ARTIFACTS_RUN_NUMBER: 329 # ${{ github.event.inputs.ci_artifacts_run_number || github.run_number }}
 
 jobs:
+  test:
+    runs-on: ubuntu-24.04
+    environment: deploy
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/github-script@v7
+        id: get-id-token
+        # if: github.ref == 'refs/heads/main'
+        with:
+          script: |
+            const fs = require('fs');
+            const token = await core.getIDToken('backend.fullstaqruby.org');
+            fs.writeFileSync(
+              process.env.GITHUB_OUTPUT,
+              `id_token<<EOF\n${token}\nEOF\n`,
+              { flag: 'a' }
+            );
+
+      - name: Restart web server
+        run: ./internal-scripts/ci-cd/publish/restart-web-server.rb
+        # if: github.ref == 'refs/heads/main'
+        env:
+          ID_TOKEN: ${{ steps.get-id-token.outputs.id_token }}
+
+      - run: 'false'
+
   # Determines which jobs should be run, or (in case this is a re-run)
   # which jobs can be skipped this time because the last run succeeded.
   # We determine this by checking whether the artifacts produced by jobs
   # exist in this run.
   determine_necessary_jobs:
     name: Determine necessary jobs
+    needs: test
     runs-on: ubuntu-24.04
     environment: test
     permissions:

.github/workflows/ci-cd-publish-test-production.yml

@@ -112,6 +112,7 @@ jobs:
 
       - uses: actions/github-script@v7
         id: get-id-token
+        # if: github.ref == 'refs/heads/main'
         with:
           script: |
             const fs = require('fs');
@@ -124,6 +125,7 @@ jobs:
 
       - name: Restart web server
         run: ./internal-scripts/ci-cd/publish/restart-web-server.rb
+        # if: github.ref == 'refs/heads/main'
         env:
           ID_TOKEN: ${{ steps.get-id-token.outputs.id_token }}
 

.github/workflows/ci-cd-publish-test-production.yml.erb

@@ -102,6 +102,7 @@ jobs:
 
       - uses: actions/github-script@v7
         id: get-id-token
+        # if: github.ref == 'refs/heads/main'
         with:
           script: |
             const fs = require('fs');
@@ -114,6 +115,7 @@ jobs:
 
       - name: Restart web server
         run: ./internal-scripts/ci-cd/publish/restart-web-server.rb
+        # if: github.ref == 'refs/heads/main'
         env:
           ID_TOKEN: ${{ steps.get-id-token.outputs.id_token }}
 

internal-scripts/ci-cd/publish/restart-web-server.rb

@@ -30,7 +30,9 @@ def main
 
     log_notice 'Waiting until web server is restarted'
     deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + TIMEOUT_SECS
+    puts "deadline = #{deadline}"
     while true
+      puts "current time = #{Process.clock_gettime(Process::CLOCK_MONOTONIC)}"
       if Process.clock_gettime(Process::CLOCK_MONOTONIC) >= deadline
         abort('ERROR: Timed out waiting for web server to restart')
       end