From 1f1b983fceafcd617d2acaae0596036892bf531a Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 12 Sep 2024 15:23:46 -0700 Subject: [PATCH 1/2] ci: update actions This updates the GitHub actions to avoid errors related to deprecations; see [this example]. [this example]: https://github.com/WebAssembly/wasi-libc/actions/runs/10839597105/job/30080296576 --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e906e5e6..6bf6c47a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: - os: windows-latest clang_version: 16.0.0 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4.1.7 with: submodules: true @@ -135,7 +135,7 @@ jobs: # which is required by our malloc implementation. if: matrix.os == 'ubuntu-latest' && matrix.clang_version != '10.0.0' - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4.4.0 with: # Upload the sysroot folder. Give it a name according to the OS it was built for. name: ${{ format( 'sysroot-{0}.tgz', matrix.os) }} @@ -152,7 +152,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4.1.7 with: submodules: true - name: Install Rust (rustup) @@ -175,7 +175,7 @@ jobs: name: Rustfmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4.1.7 with: submodules: true - name: Install Rust From 58a9699813e06efc2a2777316a30354acd0692d5 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 12 Sep 2024 15:38:57 -0700 Subject: [PATCH 2/2] Make artifact names unique --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6bf6c47a..bf503418 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -137,8 +137,10 @@ jobs: - uses: actions/upload-artifact@v4.4.0 with: - # Upload the sysroot folder. Give it a name according to the OS it was built for. - name: ${{ format( 'sysroot-{0}.tgz', matrix.os) }} + # Upload the sysroot folder. To avoid action erros, we give it a unique + # name using the OS it was built for and the Clang version it was built + # with. + name: ${{ format( 'sysroot-{0}-clang-{1}.tgz', matrix.os, matrix.clang_version) }} path: sysroot # Disable the headerstest job for now, while WASI transitions from the