From 93ff92b658359a3d9527a8559840b477ecc8c807 Mon Sep 17 00:00:00 2001 From: Seb M'Caw Date: Mon, 9 Sep 2024 09:30:38 +0000 Subject: [PATCH 1/3] Fix CI on Linux --- .github/workflows/ci-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 7992d2199..a6872403e 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -48,7 +48,7 @@ jobs: INDEX: "" - name: Upload binaries - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@main with: name: alr-bin-linux.zip path: | From 6ee699352136694d42bdf7a8e425a7c329e7c991 Mon Sep 17 00:00:00 2001 From: Seb M'Caw Date: Mon, 9 Sep 2024 09:38:10 +0000 Subject: [PATCH 2/3] Fix others --- .github/workflows/ci-appimage.yml | 4 ++-- .github/workflows/ci-docker.yml | 2 +- .github/workflows/ci-linux.yml | 2 +- .github/workflows/ci-macos.yml | 4 ++-- .github/workflows/ci-unsupported.yml | 2 +- .github/workflows/ci-windows.yml | 2 +- .github/workflows/nightly.yml | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci-appimage.yml b/.github/workflows/ci-appimage.yml index 023b05bbb..7fc2407e5 100644 --- a/.github/workflows/ci-appimage.yml +++ b/.github/workflows/ci-appimage.yml @@ -48,7 +48,7 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@master + uses: actions/upload-artifact@main with: name: e3-log-linux.zip path: testsuite/out @@ -114,7 +114,7 @@ jobs: # regular PRs for easy testing. - name: Upload as artifact (when not a release) if: (github.event_name != 'release') - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@main with: name: alr-${{ steps.get_ref.outputs.short_sha }}-x86_64.AppImage.zip path: alr.AppImage diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index 590cb60c6..690fd2996 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -51,7 +51,7 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@master + uses: actions/upload-artifact@main with: name: e3-log-docker-${{ matrix.tag }}.zip path: testsuite/out diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index a6872403e..400c7640a 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -57,7 +57,7 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@master + uses: actions/upload-artifact@main with: name: e3-log-linux.zip path: testsuite/out diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 6903a4462..036d4cc6f 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -62,7 +62,7 @@ jobs: INDEX: "" - name: Upload binaries - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@main with: name: alr-bin-${{ env.ARCH }}-macos.zip path: | @@ -71,7 +71,7 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@master + uses: actions/upload-artifact@main with: name: testsuite-log-macos.zip path: testsuite/out diff --git a/.github/workflows/ci-unsupported.yml b/.github/workflows/ci-unsupported.yml index 5d19dc271..70fa51e5a 100644 --- a/.github/workflows/ci-unsupported.yml +++ b/.github/workflows/ci-unsupported.yml @@ -43,7 +43,7 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@master + uses: actions/upload-artifact@main with: name: e3-log-unsupported.zip path: testsuite/out diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index a909227d7..99d6fa721 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -108,7 +108,7 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@master + uses: actions/upload-artifact@main with: name: testsuite-log-windows.zip path: testsuite/out diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0c0944e8f..61c357cce 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -58,13 +58,13 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@master + uses: actions/upload-artifact@main with: name: e3-log-linux.zip path: testsuite/out - name: Upload artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@main with: name: alr-bin-${{ matrix.os }}.zip path: | From 4fc5de82c3084a96ff063a55137dd0dbe6b5d097 Mon Sep 17 00:00:00 2001 From: Seb M'Caw Date: Mon, 9 Sep 2024 12:40:25 +0000 Subject: [PATCH 3/3] Use v4 tag --- .github/workflows/ci-appimage.yml | 4 ++-- .github/workflows/ci-docker.yml | 2 +- .github/workflows/ci-linux.yml | 4 ++-- .github/workflows/ci-macos.yml | 4 ++-- .github/workflows/ci-unsupported.yml | 2 +- .github/workflows/ci-windows.yml | 8 ++++---- .github/workflows/nightly.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-appimage.yml b/.github/workflows/ci-appimage.yml index 7fc2407e5..f7e3ac4e9 100644 --- a/.github/workflows/ci-appimage.yml +++ b/.github/workflows/ci-appimage.yml @@ -48,7 +48,7 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: e3-log-linux.zip path: testsuite/out @@ -114,7 +114,7 @@ jobs: # regular PRs for easy testing. - name: Upload as artifact (when not a release) if: (github.event_name != 'release') - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: alr-${{ steps.get_ref.outputs.short_sha }}-x86_64.AppImage.zip path: alr.AppImage diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index 690fd2996..09e3ed1e2 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -51,7 +51,7 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: e3-log-docker-${{ matrix.tag }}.zip path: testsuite/out diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 400c7640a..e14e64d9a 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -48,7 +48,7 @@ jobs: INDEX: "" - name: Upload binaries - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: alr-bin-linux.zip path: | @@ -57,7 +57,7 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: e3-log-linux.zip path: testsuite/out diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 036d4cc6f..e87ea3571 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -62,7 +62,7 @@ jobs: INDEX: "" - name: Upload binaries - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: alr-bin-${{ env.ARCH }}-macos.zip path: | @@ -71,7 +71,7 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: testsuite-log-macos.zip path: testsuite/out diff --git a/.github/workflows/ci-unsupported.yml b/.github/workflows/ci-unsupported.yml index 70fa51e5a..73252f42f 100644 --- a/.github/workflows/ci-unsupported.yml +++ b/.github/workflows/ci-unsupported.yml @@ -43,7 +43,7 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: e3-log-unsupported.zip path: testsuite/out diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 99d6fa721..1193bbbad 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -89,26 +89,26 @@ jobs: ALR_INSTALL_OS: ${{ runner.os }} - name: Upload installer - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: installer-release-package path: scripts/installer/alire-*.exe - name: Upload zip archive - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: zip-release-package path: scripts/installer/alire-*.zip - name: Upload tar archive - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: tar-release-package path: scripts/installer/alire-*.tar.xz - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: testsuite-log-windows.zip path: testsuite/out diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 61c357cce..d44685008 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -58,13 +58,13 @@ jobs: - name: Upload logs (if failed) if: failure() - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: e3-log-linux.zip path: testsuite/out - name: Upload artifact - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: alr-bin-${{ matrix.os }}.zip path: |