From 37dd7178f5e9afc45de37159f61b7f91d209113f Mon Sep 17 00:00:00 2001 From: Markus Merklinger Date: Fri, 22 Mar 2024 10:52:57 +0100 Subject: [PATCH 1/4] Update Github checkout action --- .github/workflows/cd-linux.yaml | 4 ++-- .github/workflows/cd-pypi.yaml | 6 +++--- .github/workflows/cd-windows.yaml | 8 ++++---- .github/workflows/ci.yaml | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cd-linux.yaml b/.github/workflows/cd-linux.yaml index 6373e724..2b1f2634 100644 --- a/.github/workflows/cd-linux.yaml +++ b/.github/workflows/cd-linux.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Check version tag format run: | TAG_VERSION="${{ github.event.release.tag_name }}" @@ -29,7 +29,7 @@ jobs: needs: version-check steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install required packages run: | apt update diff --git a/.github/workflows/cd-pypi.yaml b/.github/workflows/cd-pypi.yaml index 68413eae..7dd19fd8 100644 --- a/.github/workflows/cd-pypi.yaml +++ b/.github/workflows/cd-pypi.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Check version tag format run: | TAG_VERSION="${{ github.event.release.tag_name }}" @@ -29,7 +29,7 @@ jobs: needs: version-check steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install required packages run: | apt update @@ -60,7 +60,7 @@ jobs: with: name: nitropy-pypi - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install required packages run: | apt update diff --git a/.github/workflows/cd-windows.yaml b/.github/workflows/cd-windows.yaml index bb7e3331..34d92ee0 100644 --- a/.github/workflows/cd-windows.yaml +++ b/.github/workflows/cd-windows.yaml @@ -13,7 +13,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Check version tag format run: | $VERSION_TAG="${{ github.event.release.tag_name }}" @@ -29,7 +29,7 @@ jobs: needs: version-check steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create virtual environment run: | python -m venv venv @@ -59,7 +59,7 @@ jobs: needs: version-check steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create virtual environment run: | python -m venv venv @@ -89,7 +89,7 @@ jobs: needs: build-onedir steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download artifact uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0452fe87..5af59b9a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,7 @@ jobs: container: python:3.9-slim steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install required packages run: | apt update @@ -32,7 +32,7 @@ jobs: container: python:3.9-slim steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install required packages run: | apt update @@ -49,7 +49,7 @@ jobs: container: python:3.9-slim steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install required packages run: | apt update @@ -66,7 +66,7 @@ jobs: container: python:3.9-slim steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install required packages run: | apt update From acb34701bbfb3a9a2a6f2a4dc29bb81ba1299dd4 Mon Sep 17 00:00:00 2001 From: Markus Merklinger Date: Fri, 22 Mar 2024 10:55:17 +0100 Subject: [PATCH 2/4] Update Github upload-artifact action --- .github/workflows/cd-linux.yaml | 2 +- .github/workflows/cd-pypi.yaml | 2 +- .github/workflows/cd-windows.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd-linux.yaml b/.github/workflows/cd-linux.yaml index 2b1f2634..21997e04 100644 --- a/.github/workflows/cd-linux.yaml +++ b/.github/workflows/cd-linux.yaml @@ -52,7 +52,7 @@ jobs: pyinstaller \ ci-scripts/linux/pyinstaller/pynitrokey-onefile.spec - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: nitropy-onefile path: dist/nitropy diff --git a/.github/workflows/cd-pypi.yaml b/.github/workflows/cd-pypi.yaml index 7dd19fd8..11bb1e27 100644 --- a/.github/workflows/cd-pypi.yaml +++ b/.github/workflows/cd-pypi.yaml @@ -45,7 +45,7 @@ jobs: . venv/bin/activate flit build - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: nitropy-pypi path: dist diff --git a/.github/workflows/cd-windows.yaml b/.github/workflows/cd-windows.yaml index 34d92ee0..63696665 100644 --- a/.github/workflows/cd-windows.yaml +++ b/.github/workflows/cd-windows.yaml @@ -49,7 +49,7 @@ jobs: .\venv\Scripts\Activate.ps1 pyinstaller ci-scripts/windows/pyinstaller/pynitrokey-onedir.spec - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: pynitrokey-onedir path: dist/nitropy @@ -79,7 +79,7 @@ jobs: .\venv\Scripts\Activate.ps1 pyinstaller ci-scripts/windows/pyinstaller/pynitrokey-onefile.spec - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: pynitrokey-onefile path: dist/nitropy.exe @@ -127,7 +127,7 @@ jobs: .\Sources.wixobj ` -o nitropy.msi - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: nitropy-installer path: nitropy.msi From 4ec5029c51c7ec0ffd7d11e3fcef1fee470b93d4 Mon Sep 17 00:00:00 2001 From: Markus Merklinger Date: Fri, 22 Mar 2024 10:56:35 +0100 Subject: [PATCH 3/4] Update Github download-artifact action --- .github/workflows/cd-linux.yaml | 2 +- .github/workflows/cd-pypi.yaml | 2 +- .github/workflows/cd-windows.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd-linux.yaml b/.github/workflows/cd-linux.yaml index 21997e04..877de6fd 100644 --- a/.github/workflows/cd-linux.yaml +++ b/.github/workflows/cd-linux.yaml @@ -65,7 +65,7 @@ jobs: contents: write steps: - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: nitropy-onefile - name: Rename binary diff --git a/.github/workflows/cd-pypi.yaml b/.github/workflows/cd-pypi.yaml index 11bb1e27..31abf7b1 100644 --- a/.github/workflows/cd-pypi.yaml +++ b/.github/workflows/cd-pypi.yaml @@ -56,7 +56,7 @@ jobs: needs: build steps: - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: nitropy-pypi - name: Checkout repository diff --git a/.github/workflows/cd-windows.yaml b/.github/workflows/cd-windows.yaml index 63696665..011942a5 100644 --- a/.github/workflows/cd-windows.yaml +++ b/.github/workflows/cd-windows.yaml @@ -91,7 +91,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: pynitrokey-onedir path: dist/nitropy @@ -139,7 +139,7 @@ jobs: contents: write steps: - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: pynitrokey-onefile - name: Rename binary @@ -164,7 +164,7 @@ jobs: contents: write steps: - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: nitropy-installer - name: Rename installer From 6b16abe3194af8b771bec885e6edaa4db7fce1f8 Mon Sep 17 00:00:00 2001 From: Markus Merklinger Date: Fri, 22 Mar 2024 10:57:55 +0100 Subject: [PATCH 4/4] Update Github release action --- .github/workflows/cd-linux.yaml | 2 +- .github/workflows/cd-windows.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd-linux.yaml b/.github/workflows/cd-linux.yaml index 877de6fd..90c745c5 100644 --- a/.github/workflows/cd-linux.yaml +++ b/.github/workflows/cd-linux.yaml @@ -80,6 +80,6 @@ jobs: nitropy-${{ github.event.release.tag_name }}-x64-linux-binary.tar.gz \ nitropy-${{ github.event.release.tag_name }}-x64-linux-binary - name: Publish release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: nitropy-${{ github.event.release.tag_name }}-x64-linux-binary.tar.gz \ No newline at end of file diff --git a/.github/workflows/cd-windows.yaml b/.github/workflows/cd-windows.yaml index 011942a5..b4666107 100644 --- a/.github/workflows/cd-windows.yaml +++ b/.github/workflows/cd-windows.yaml @@ -153,7 +153,7 @@ jobs: nitropy-${{ github.event.release.tag_name }}-x64-windows-binary.zip ` nitropy-${{ github.event.release.tag_name }}-x64-windows-binary.exe - name: Publish release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: nitropy-${{ github.event.release.tag_name }}-x64-windows-binary.zip publish-msi-installer: @@ -173,6 +173,6 @@ jobs: nitropy.msi ` nitropy-${{ github.event.release.tag_name }}-x64-windows-installer.msi - name: Publish release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: nitropy-${{ github.event.release.tag_name }}-x64-windows-installer.msi \ No newline at end of file