From 5f3040ccaa3fa1ba2d0871bdba599b923c67f17f Mon Sep 17 00:00:00 2001 From: Charlie Birks Date: Tue, 3 Mar 2026 14:33:14 +0000 Subject: [PATCH] Update actions --- .github/workflows/build.yml | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4457a3..82e4ea2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,19 +26,19 @@ jobs: strategy: matrix: include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 name: Linux release-suffix: LIN64 cmake-args: -D32BLIT_DIR=$GITHUB_WORKSPACE/32blit-sdk apt-packages: libsdl2-dev libsdl2-image-dev libsdl2-net-dev python3-setuptools - - os: ubuntu-20.04 + - os: ubuntu-22.04 name: STM32 release-suffix: STM32 cmake-args: -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/32blit-sdk/32blit.toolchain apt-packages: gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib python3-setuptools - - os: ubuntu-20.04 + - os: ubuntu-22.04 pico-sdk: true name: PicoSystem cache-key: picosystem @@ -46,7 +46,7 @@ jobs: cmake-args: -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/32blit-sdk/pico.toolchain -DPICO_BOARD=pimoroni_picosystem apt-packages: gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib python3-setuptools - - os: ubuntu-20.04 + - os: ubuntu-22.04 name: Emscripten release-suffix: WEB cmake-args: -D32BLIT_DIR=$GITHUB_WORKSPACE/32blit-sdk @@ -72,13 +72,13 @@ jobs: steps: # Check out the main repo - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: main # Check out the 32Blit API we build against - name: Checkout 32Blit API - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: 32blit/32blit-sdk path: 32blit-sdk @@ -124,7 +124,7 @@ jobs: - name: Setup Emscripten if: matrix.name == 'Emscripten' - uses: mymindstorm/setup-emsdk@v7 + uses: mymindstorm/setup-emsdk@v14 with: version: ${{env.EM_VERSION}} actions-cache-folder: ${{env.EM_CACHE_FOLDER}} @@ -161,23 +161,13 @@ jobs: # Push the tar file to the release - name: Upload tar if: github.event_name == 'release' && matrix.release-suffix != '' - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + uses: softprops/action-gh-release@v1 with: - asset_path: ${{runner.workspace}}/main/build/${{env.RELEASE_FILE}}.tar.gz - upload_url: ${{github.event.release.upload_url}} - asset_name: ${{env.RELEASE_FILE}}.tar.gz - asset_content_type: application/octet-stream + files: ${{runner.workspace}}/main/build/${{env.RELEASE_FILE}}.tar.gz # Push the zip file to the release - name: Upload zip if: github.event_name == 'release' && matrix.release-suffix != '' - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + uses: softprops/action-gh-release@v1 with: - asset_path: ${{runner.workspace}}/main/build/${{env.RELEASE_FILE}}.zip - upload_url: ${{github.event.release.upload_url}} - asset_name: ${{env.RELEASE_FILE}}.zip - asset_content_type: application/zip + files: ${{runner.workspace}}/main/build/${{env.RELEASE_FILE}}.zip