Skip to content

Commit

Permalink
Merge pull request #213 from mmerklinger/cicd-update
Browse files Browse the repository at this point in the history
Update used Github Actions in CICD pipelines
  • Loading branch information
mmerklinger authored Mar 13, 2024
2 parents 1bf14a2 + c7aecdb commit 3643c92
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 37 deletions.
16 changes: 5 additions & 11 deletions .github/workflows/cd-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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
Expand All @@ -36,7 +36,7 @@ jobs:
needs: version-check
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install required packages
run: |
apt update
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Build
run: make build-pyinstaller-onefile
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nitrokey-app-onefile
path: dist/nitrokey-app
Expand All @@ -80,21 +80,15 @@ jobs:
contents: write
steps:
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: nitrokey-app-onefile
- name: Rename binary
run: |
mv \
nitrokey-app \
nitrokey-app-${{ github.event.release.tag_name }}-x64-linux-binary
- name: Create archive
run: |
tar \
-czvf \
nitrokey-app-${{ github.event.release.tag_name }}-x64-linux-binary.tar.gz \
nitrokey-app-${{ github.event.release.tag_name }}-x64-linux-binary
- name: Publish release
uses: softprops/action-gh-release@v1
with:
files: nitrokey-app-${{ github.event.release.tag_name }}-x64-linux-binary.tar.gz
files: nitrokey-app-${{ github.event.release.tag_name }}-x64-linux-binary
10 changes: 5 additions & 5 deletions .github/workflows/cd-pypi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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
Expand All @@ -36,7 +36,7 @@ jobs:
needs: version-check
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install required packages
run: |
apt update
Expand All @@ -46,7 +46,7 @@ jobs:
- name: Build
run: make build
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nitrokeyapp-pypi
path: dist
Expand All @@ -60,9 +60,9 @@ jobs:
POETRY_PYPI_URL: https://upload.pypi.org/legacy/
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: nitrokeyapp-pypi
path: dist
Expand Down
27 changes: 11 additions & 16 deletions .github/workflows/cd-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install required packages
run: choco install poetry --source python
- name: Create virtual envrionment
Expand All @@ -31,7 +31,7 @@ jobs:
needs: version-check
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install required packages
run: choco install poetry --source python
- name: Create virtual environment
Expand All @@ -49,7 +49,7 @@ jobs:
make build-ui
pyinstaller ci-scripts/windows/pyinstaller/nitrokey-app-onedir.spec
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nitrokey-app-onedir
path: dist/nitrokey-app
Expand All @@ -59,7 +59,7 @@ jobs:
needs: version-check
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install required packages
run: choco install poetry --source python
- name: Create virtual environment
Expand All @@ -77,7 +77,7 @@ jobs:
make build-ui
pyinstaller ci-scripts/windows/pyinstaller/nitrokey-app-onefile.spec
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nitrokey-app-onefile
path: dist/nitrokey-app.exe
Expand All @@ -87,9 +87,9 @@ jobs:
needs: build-onedir
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: nitrokey-app-onedir
path: dist/nitrokey-app
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
.\Sources.wixobj `
-o nitrokey-app.msi
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nitrokey-app-installer
path: nitrokey-app.msi
Expand All @@ -137,23 +137,18 @@ jobs:
contents: write
steps:
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: nitrokey-app-onefile
- name: Rename binary
run: |
mv `
nitrokey-app.exe `
nitrokey-app-${{ github.event.release.tag_name }}-x64-windows-binary.exe
- name: Create archive
run: |
7z a -tzip -mx9 `
nitrokey-app-${{ github.event.release.tag_name }}-x64-windows-binary.zip `
nitrokey-app-${{ github.event.release.tag_name }}-x64-windows-binary.exe
- name: Publish release
uses: softprops/action-gh-release@v1
with:
files: nitrokey-app-${{ github.event.release.tag_name }}-x64-windows-binary.zip
files: nitrokey-app-${{ github.event.release.tag_name }}-x64-windows-binary.exe
publish-msi-installer:
name: Publish MSI installer
runs-on: windows-latest
Expand All @@ -162,7 +157,7 @@ jobs:
contents: write
steps:
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: nitrokey-app-installer
- name: Rename installer
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
container: python:3.9-slim
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install required packages
run: pip install poetry
- name: Check pyproject.toml syntax and consistency with poetry.lock
Expand All @@ -23,7 +23,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
Expand All @@ -38,7 +38,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
Expand All @@ -53,7 +53,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
Expand All @@ -68,7 +68,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
Expand Down

0 comments on commit 3643c92

Please sign in to comment.