From 809fe5e89479f23cff193ee928fd7b10839f4c9f Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Tue, 25 Oct 2022 18:59:09 +0200 Subject: [PATCH 1/3] CI: Update GitHub actions environments and used actions Updates the used actions to their latest versions, and update the images to the -latest tags. This currently means Ubuntu will use 20.04 LTS (and soon 22.04 LTS) and macOS will use macOS 12. Also adds a workflow_dispatch trigger to the main workflow (the others already have it). --- .github/workflows/appimage.yml | 9 +++++---- .github/workflows/macos.yml | 7 ++++--- .github/workflows/windows.yml | 11 ++++++----- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index cc0d16b8f..0f68e1ad5 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -10,16 +10,17 @@ on: branches: - dev workflow_dispatch: + jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: build_type: [release] steps: - name: Checkout source - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -88,7 +89,7 @@ jobs: - name: Restore AppImage tools from cache id: appimage-tools-cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: key: appimage-tools-1 path: | @@ -138,7 +139,7 @@ jobs: echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{env.ARTIFACT_NAME}}.AppImage path: ${{github.workspace}}/build/${{env.ARTIFACT_NAME}}.AppImage diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 11ae28aa4..47af9985f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -10,11 +10,12 @@ on: branches: - dev workflow_dispatch: + jobs: build: - runs-on: macos-11 + runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dependencies run: | date -u @@ -91,7 +92,7 @@ jobs: "ARTIFACT_FILE: ${ARTIFACT_FILE}" \ "PUBLISH_NAME: ${PUBLISH_NAME}" exit - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: ${{env.ARTIFACT_FILE}} path: ${{env.ARTIFACT_PATH}} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 296037812..8332dca82 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -10,9 +10,10 @@ on: branches: - dev workflow_dispatch: + jobs: build: - runs-on: windows-2022 + runs-on: windows-latest defaults: run: shell: msys2 {0} @@ -22,7 +23,7 @@ jobs: build_type: [release, debug] steps: - name: Checkout source - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -49,7 +50,7 @@ jobs: - name: Configure build run: | export REF_NAME_FILTERED="$(echo '${{github.ref_name}}' | sed 's/[^A-z0-9_.-]//g')" - + if [ '${{github.ref_type}}' == 'tag' ]; then export CACHE_SUFFIX="" else @@ -249,14 +250,14 @@ jobs: 7z a -tzip "%ARTIFACT_NAME%.zip" "./%ARTIFACT_NAME%" - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{env.ARTIFACT_NAME}} path: build\${{env.ARTIFACT_NAME}} - name: Upload installer if: ${{matrix.build_type == 'release' && (github.ref_type == 'tag' || github.ref_name == 'dev')}} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{env.ARTIFACT_NAME}}.exe path: build\${{env.ARTIFACT_NAME}}.exe From 0fc342e4dce0c3f1e4e03e645a91781054b76a6f Mon Sep 17 00:00:00 2001 From: Beep6581 Date: Mon, 28 Aug 2023 23:10:37 +0200 Subject: [PATCH 2/3] Update appimage.yml Use ubuntu-20.04 image. --- .github/workflows/appimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 0f68e1ad5..40323c074 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -13,7 +13,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: From a2029ba5d2c65823066d2732b09d8c91e70053ed Mon Sep 17 00:00:00 2001 From: Beep6581 Date: Mon, 28 Aug 2023 23:12:03 +0200 Subject: [PATCH 3/3] Update macos.yml Use macos-11 image. --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 47af9985f..f10b1fd80 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,7 +13,7 @@ on: jobs: build: - runs-on: macos-latest + runs-on: macos-11 steps: - uses: actions/checkout@v3 - name: Install dependencies