Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 37 additions & 8 deletions .github/workflows/reusable-build-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -81,13 +81,42 @@ jobs:
echo "KONCENTRO_VERSION=$version" >> $env:GITHUB_ENV
Write-Output "Koncentro version: $version"

- name: Install Poetry
run: |
python -m pip install --upgrade pip
python -m pip install poetry

- name: Create venv and add to PATH (Linux and MacOS)
if: matrix.os == 'ubuntu-22.04' || matrix.os == 'ubuntu-24.04-arm' || matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel'
env:
POETRY_VIRTUALENVS_CREATE: true
POETRY_VIRTUALENVS_IN_PROJECT: true
run: |
poetry env use python
VENV_PATH=$(poetry env info -p)
echo "VENV_PATH=$VENV_PATH" >> $GITHUB_ENV
echo "$VENV_PATH/bin" >> $GITHUB_PATH

- name: Create venv and add to PATH (Windows)
if: matrix.os == 'windows-latest'
env:
POETRY_VIRTUALENVS_CREATE: true
POETRY_VIRTUALENVS_IN_PROJECT: true
run: |
poetry env use python
$venvPath = poetry env info -p
echo "VENV_PATH=$venvPath" >> $env:GITHUB_ENV
echo "$venvPath\Scripts" >> $env:GITHUB_PATH

- name: Install dependencies
env:
POETRY_VIRTUALENVS_CREATE: false
POETRY_VIRTUALENVS_CREATE: true
POETRY_VIRTUALENVS_IN_PROJECT: true
PIP_DEFAULT_TIMEOUT: 120
PIP_RETRIES: 5
run: |
python -m pip install --upgrade pip
python -m pip install poetry
poetry install --no-cache --no-interaction --no-root
poetry install --no-cache --no-interaction --no-root --only main,build

- name: Debug Packages
run: |
Expand Down Expand Up @@ -200,23 +229,23 @@ jobs:
- name: Upload artifacts Windows
if: matrix.os == 'windows-latest'
id: upload-unsigned-artifact-windows
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: 'Windows_${{ env.ARCHITECTURE }}-build'
path: 'build\__main__.dist\'
include-hidden-files: 'true'

- name: Upload artifacts Linux
if: matrix.os == 'ubuntu-22.04' || matrix.os == 'ubuntu-24.04-arm'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: 'Linux_${{ env.ARCHITECTURE }}-build'
path: 'build/__main__.dist/'
include-hidden-files: 'true'

- name: Upload artifacts MacOS
if: matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: 'macOS_${{ env.ARCHITECTURE }}-build'
path: 'dist'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-check-mitmproxy-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- name: Get latest mitmproxy release
id: get_latest_release
uses: octokit/request-action@v2.x
uses: octokit/request-action@v3.x
with:
route: GET /repos/{owner}/{repo}/releases/latest
owner: mitmproxy
Expand All @@ -34,7 +34,7 @@ jobs:

- name: Get latest mitmproxy nuitka binary version
id: get_nuitka_release
uses: octokit/request-action@v2.x
uses: octokit/request-action@v3.x
with:
route: GET /repos/{owner}/{repo}/releases/latest
owner: kun-codes
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/reusable-create-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ jobs:
shell: bash

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}

- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: tree command (Windows)
if: matrix.os == 'windows-latest'
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
id: download-artifacts
if: ${{ !(matrix.os == 'windows-latest' && inputs.deployment) }} # for release build,
# artifacts would be downloaded directly from github by signpath signing step
uses: actions/download-artifact@v5
uses: actions/download-artifact@v8
with:
artifact-ids: ${{ steps.get-artifact-id.outputs.artifact-id }}
path: artifacts
Expand All @@ -102,7 +102,7 @@ jobs:
Write-Output "Koncentro version: $version"

- name: Release-sign artifacts (Windows)
uses: signpath/github-action-submit-signing-request@v1
uses: signpath/github-action-submit-signing-request@v2
if: matrix.os == 'windows-latest' && inputs.deployment
with:
api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
Expand Down Expand Up @@ -176,13 +176,13 @@ jobs:
- name: Upload Unsigned Installer (Windows)
if: matrix.os == 'windows-latest'
id: upload-unsigned-artifact-windows
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: Koncentro-${{ env.KONCENTRO_VERSION }}-Windows-x86_64-Installer
path: dist/Koncentro-${{ env.KONCENTRO_VERSION }}-Installer.exe

- name: Release-sign installer (Windows)
uses: signpath/github-action-submit-signing-request@v1
uses: signpath/github-action-submit-signing-request@v2
if: matrix.os == 'windows-latest' && inputs.deployment
with:
api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
Expand All @@ -196,42 +196,42 @@ jobs:

- name: Delete unsigned installer artifact (Windows)
if: matrix.os == 'windows-latest' && inputs.deployment
uses: geekyeggo/delete-artifact@v5
uses: geekyeggo/delete-artifact@v6
with:
name: Koncentro-${{ env.KONCENTRO_VERSION }}-Windows-x86_64-Installer

- name: Upload Signed Installer (Windows)
if: matrix.os == 'windows-latest' && inputs.deployment
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: Koncentro-${{ env.KONCENTRO_VERSION }}-Windows-x86_64-Installer
path: dist/Koncentro-${{ env.KONCENTRO_VERSION }}-Installer-signed.exe


- name: Upload Installer (macOS)
if: matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: Koncentro-${{ env.KONCENTRO_VERSION }}-macOS-${{ env.ARCHITECTURE }}-Installer
path: dist/*

- name: Upload DEB Installer (Linux)
if: matrix.os == 'ubuntu-22.04' || matrix.os == 'ubuntu-24.04-arm'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: Koncentro-${{ env.KONCENTRO_VERSION }}-Linux-${{ env.ARCHITECTURE }}-DEB
path: dist/*.deb

- name: Upload Fedora RPM Installer (Linux)
if: matrix.os == 'ubuntu-22.04' || matrix.os == 'ubuntu-24.04-arm'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: Koncentro-${{ env.KONCENTRO_VERSION }}-Linux-${{ env.ARCHITECTURE }}-Fedora-RPM
path: dist/*Fedora.rpm

- name: Upload openSUSE RPM Installer (Linux)
if: matrix.os == 'ubuntu-22.04' || matrix.os == 'ubuntu-24.04-arm'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: Koncentro-${{ env.KONCENTRO_VERSION }}-Linux-${{ env.ARCHITECTURE }}-openSUSE-RPM
path: dist/*openSUSE.rpm
6 changes: 3 additions & 3 deletions .github/workflows/reusable-release-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
contents: write # Required to create releases
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: '3.12'

Expand All @@ -26,7 +26,7 @@ jobs:
echo "Koncentro version: $KONCENTRO_VERSION"

- name: Download all artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
pattern: Koncentro*
path: release-artifacts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ruff-lint-on-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup Ruff
uses: astral-sh/ruff-action@v3
uses: astral-sh/ruff-action@v4.0.0

Loading