From 00b84cb57c36fb1a1281d98c127ad5f4024bfaa6 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 2 Oct 2024 21:34:10 +0300 Subject: [PATCH 1/3] [ci] Cleanup artifacts upload --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 116b7aa3..17fee5b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,9 +56,9 @@ jobs: - name: Upload if: github.ref_type == 'tag' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: bin-${{ runner.os }} + name: ots-${{ env.ots_version }}-${{ runner.os }} path: ots-*.zip if-no-files-found: error @@ -68,9 +68,9 @@ jobs: - name: Upload Dist Tarball if: github.ref_type == 'tag' && matrix.os == 'ubuntu-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: dist + name: ots-${{ env.ots_version }} path: build/meson-dist/ots-*.tar.xz if-no-files-found: error @@ -83,7 +83,7 @@ jobs: - uses: actions/checkout@v3 - name: Download artifacts from build jobs - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: path: dist From 649023791ad7435e012ce0b1665b25c7ef7a3ef8 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 2 Oct 2024 21:49:11 +0300 Subject: [PATCH 2/3] [ci] Always upload artifacts --- .github/workflows/ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17fee5b2..f3c5e627 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,6 @@ jobs: run: ninja -C build test - name: Install - if: github.ref_type == 'tag' shell: bash run: | ninja -C build install @@ -48,14 +47,12 @@ jobs: mv -v dist/bin ots-$VERSION-${{ runner.os }} - name: Archive - if: github.ref_type == 'tag' uses: thedoctor0/zip-release@master with: path: ots-${{ env.ots_version }}-${{ runner.os }} filename: ots-${{ env.ots_version }}-${{ runner.os }}.zip - name: Upload - if: github.ref_type == 'tag' uses: actions/upload-artifact@v4 with: name: ots-${{ env.ots_version }}-${{ runner.os }} @@ -63,11 +60,11 @@ jobs: if-no-files-found: error - name: Make Dist Tarball - if: github.ref_type == 'tag' && matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-latest' run: meson dist -C build --no-tests - name: Upload Dist Tarball - if: github.ref_type == 'tag' && matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-latest' uses: actions/upload-artifact@v4 with: name: ots-${{ env.ots_version }} From 47008cc64e2e09ac4f3e15f8bbcd5a088f43d192 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 2 Oct 2024 21:55:21 +0300 Subject: [PATCH 3/3] [ci] Update more GitHub actions --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3c5e627..54c80e90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,9 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download artifacts from build jobs uses: actions/download-artifact@v4