From b5d986301cdd6d7745401029b247e209696e93ef Mon Sep 17 00:00:00 2001 From: Joshua Colvin Date: Thu, 20 Jul 2023 13:43:51 -0700 Subject: [PATCH 1/4] stop using deprecated github actions `::set-output` refactor as suggested in https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cf5fdd5ca9..10259292b3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -65,7 +65,7 @@ jobs: # We work around this by piping a tarball through stdout docker run --rm --entrypoint tar localhost:5000/nitro-node-dev:latest -cf - target/machines/latest | tar xf - module_root="$(cat "target/machines/latest/module-root.txt")" - echo "::set-output name=module-root::$module_root" + echo "name=module-root=$module_root" >> $GITHUB_STATE echo -e "\x1b[1;34mWAVM module root:\x1b[0m $module_root" - name: Upload WAVM machine as artifact From ba5be94f8ea6bf2a4b2880d8ac2403f9f900e2b1 Mon Sep 17 00:00:00 2001 From: Joshua Colvin Date: Thu, 20 Jul 2023 17:05:26 -0700 Subject: [PATCH 2/4] Force arbitrator CI to run --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 4b6928151f..96f15c20ce 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ # have to update an existing file. So - for docker, convert all dependencies # to order-only dependencies (timestamps ignored). # WARNING: when using this trick, you cannot use the $< automatic variable + ifeq ($(origin NITRO_BUILD_IGNORE_TIMESTAMPS),undefined) DEP_PREDICATE:= ORDER_ONLY_PREDICATE:=| From 34dfb97dc12a5d65adfbbf589e7d6a478ba08f5c Mon Sep 17 00:00:00 2001 From: Joshua Colvin Date: Thu, 20 Jul 2023 17:45:51 -0700 Subject: [PATCH 3/4] update github action versions github deprecated node12, so update all actions to supported versions --- .github/workflows/arbitrator-ci.yml | 6 +++--- .github/workflows/ci.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/docker.yml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml index e11f5511a1..a1e912a3fc 100644 --- a/.github/workflows/arbitrator-ci.yml +++ b/.github/workflows/arbitrator-ci.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-8 steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v3 with: submodules: recursive @@ -36,12 +36,12 @@ jobs: sudo ln -s /usr/bin/wasm-ld-14 /usr/local/bin/wasm-ld - name: Install go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: go-version: 1.20.x - name: Setup nodejs - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: '16' cache: 'yarn' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c77ef3b770..d2f5765d72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true @@ -36,14 +36,14 @@ jobs: run: sudo apt update && sudo apt install -y wabt gotestsum - name: Setup nodejs - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: '16' cache: 'yarn' cache-dependency-path: '**/yarn.lock' - name: Install go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: go-version: 1.20.x diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 92411d17e2..1b2e92754a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -59,14 +59,14 @@ jobs: config-file: ./.github/codeql/codeql-config.yml - name: Setup nodejs - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: '16' cache: 'yarn' cache-dependency-path: '**/yarn.lock' - name: Install go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: go-version: 1.20.x diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 10259292b3..d391dd4096 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive From 3c98e5229934f1bedfefbe4a1bc525098cfa90a9 Mon Sep 17 00:00:00 2001 From: Joshua Colvin Date: Thu, 20 Jul 2023 19:15:23 -0700 Subject: [PATCH 4/4] update emsdk version to support node16 --- .github/workflows/arbitrator-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml index a1e912a3fc..ae25171859 100644 --- a/.github/workflows/arbitrator-ci.yml +++ b/.github/workflows/arbitrator-ci.yml @@ -119,7 +119,7 @@ jobs: - name: Setup emsdk if: steps.cache-cbrotli.outputs.cache-hit != 'true' - uses: mymindstorm/setup-emsdk@v11 + uses: mymindstorm/setup-emsdk@v12 with: # Make sure to set a version number! version: 3.1.6