Merge pull request #2 from benjyw/fix_ci

Upgrade Rust, update Python lockfile and fix CI

Author: benjyw

.github/workflows/check-toolchain-token.yml

@@ -4,7 +4,7 @@ on:
 jobs:
   check-toolchain-token:
     name: Check Toolchain Token
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         python-version: ["3.9"]

.github/workflows/check-upstream-scripts.yml

@@ -1,10 +1,10 @@
 name: Check for changes in upstream scripts
-on: 
+on:
   workflow_dispatch: # Allow running on-demand
 jobs:
   check-scripts:
     name: Check for upstream changes to script
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         python-version: ["3.9"]
@@ -25,5 +25,5 @@ jobs:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_COLOR: yellow
           SLACK_TITLE: Out of date script
-          SLACK_MESSAGE: "A local in repo script is out of date compared to an upstream script., See log for details: https://github.com/toolchainlabs/toolchain/actions/workflows/check-upstream-scripts.yml"
+          SLACK_MESSAGE: "A local in repo script is out of date compared to an upstream script., See log for details: https://github.com/toolchainlabs/toolchain-oss/actions/workflows/check-upstream-scripts.yml"
           SLACK_CHANNEL: "devops"

.github/workflows/node-js-ci.yml

@@ -1,5 +1,5 @@
 name: Node JS CI
-on: 
+on:
   push:
     branches:
       - master
@@ -9,9 +9,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 jobs:
-  check_for_changes: 
+  check_for_changes:
       name: Check JS Changes
-      runs-on: ubuntu-latest
+      runs-on: ubuntu-24.04
       outputs:
         js_changes: ${{ steps.changed-files.outputs.any_modified }}
       steps:
@@ -29,7 +29,7 @@ jobs:
             .github/**
   nodes_js_ci:
     name: Node/JS CI
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: check_for_changes
     timeout-minutes: 20
     steps:
@@ -106,7 +106,7 @@ jobs:
         run: yarn build
   cypress-run:
     name: Cypress tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: check_for_changes
     if: needs.check_for_changes.outputs.js_changes == 'true'
     steps:
@@ -117,7 +117,7 @@ jobs:
         with:
           cache: 'yarn'
           cache-dependency-path: src/node/yarn.lock
-          node-version-file: 'src/node/toolchain/pants-demo-site/.nvmrc'  
+          node-version-file: 'src/node/toolchain/pants-demo-site/.nvmrc'
       # Install NPM dependencies, cache them correctly
       # and run all Cypress tests
       - name: Cypress run

.github/workflows/pacakges-audit.yml .github/workflows/packages-audit.yml.github/workflows/pacakges-audit.yml renamed to .github/workflows/packages-audit.yml

@@ -1,14 +1,14 @@
 name: Audit reqs
-on: 
+on:
   workflow_dispatch: # Allow running on-demand
 jobs:
   audit-python:
     name: Audit python packages
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         python-version: ["3.9"]
-        os: [ubuntu-latest]
+        os: [ubuntu-24.04]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -40,5 +40,5 @@ jobs:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_COLOR: red
           SLACK_TITLE: Python Packages Security Audit FAILED.
-          SLACK_MESSAGE: "There is a security vulnerability in one of the python packages used by Toolchain, See log for details: https://github.com/toolchainlabs/toolchain/actions/workflows/pacakges-audit.yml"
+          SLACK_MESSAGE: "There is a security vulnerability in one of the python packages used by Toolchain, See log for details: https://github.com/toolchainlabs/toolchain-oss/actions/workflows/packages-audit.yml"
           SLACK_CHANNEL: "devops"

.github/workflows/rust-ci.yml

@@ -1,5 +1,5 @@
 name: Rust CI
-on: 
+on:
   push:
     branches:
       - master
@@ -9,7 +9,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 jobs:
-   check_for_changes: 
+   check_for_changes:
       name: Check Rust Changes
       runs-on: ubuntu-latest
       outputs:
@@ -44,7 +44,7 @@ jobs:
       - uses: actions-rs/toolchain@v1.0.7
         if: needs.check_for_changes.outputs.rust_changes == 'true'
         with:
-          toolchain: 1.68.0
+          toolchain: 1.93.0
       - name: Install Protoc
         uses: arduino/setup-protoc@64c0c85d18e984422218383b81c52f8b077404d3
         if: needs.check_for_changes.outputs.rust_changes == 'true'