diff --git a/.github/workflows/lint-and-build.yml b/.github/workflows/lint-and-build.yml index 9a60d67a..1d7ca11b 100644 --- a/.github/workflows/lint-and-build.yml +++ b/.github/workflows/lint-and-build.yml @@ -77,11 +77,10 @@ jobs: os: [windows-latest, ubuntu-22.04] python-version: ["3.13"] include: - # I had some Qt Wayland issues on 3.12 for ubuntu-22.04 iirc. TODO: test it + # I had some Qt Wayland issues on 3.12 for ubuntu-22.04 + # This should be fixed with QT_QPA_PLATFORM=xcb, but keeping it until next major upgrade - os: ubuntu-22.04 python-version: "3.11" - - os: ubuntu-22.04 - python-version: "3.12" steps: - uses: actions/checkout@v4 - name: Set up uv for Python ${{ matrix.python-version }} @@ -92,7 +91,7 @@ jobs: cache-dependency-glob: "uv.lock" python-version: ${{ matrix.python-version }} # https://github.com/pyinstaller/pyinstaller/issues/9012 - - name: Set up uv for Python ${{ matrix.python-version }} + - name: Set up uv if: ${{ matrix.os == 'ubuntu-22.04' }} uses: astral-sh/setup-uv@v5 with: @@ -109,10 +108,18 @@ jobs: shell: pwsh - name: Add empty profile run: echo "" > dist/settings.toml + - name: Extract AutoSplit version + id: autosplit_version + run: | + $Env:AUTOSPLIT_VERSION=uv run python -c "import utils; print(utils.AUTOSPLIT_VERSION)" + echo "AUTOSPLIT_VERSION=$Env:AUTOSPLIT_VERSION" >> $Env:GITHUB_OUTPUT + shell: pwsh - name: Upload Build Artifact uses: actions/upload-artifact@v4 with: - name: AutoSplit for ${{ matrix.os }} (Python ${{ matrix.python-version }}) + name: > + AutoSplit v${{ steps.autosplit_version.outputs.AUTOSPLIT_VERSION }} + for ${{ matrix.os }} (Python ${{ matrix.python-version }}) path: | dist/AutoSplit* dist/settings.toml diff --git a/src/utils.py b/src/utils.py index 63630861..289bb857 100644 --- a/src/utils.py +++ b/src/utils.py @@ -313,6 +313,6 @@ def run_tesseract(png: bytes): # Shared strings # Check `excludeBuildNumber` during workflow dispatch build generate a clean version number -AUTOSPLIT_VERSION = "2.3.0" + (f"-{AUTOSPLIT_BUILD_NUMBER}" if AUTOSPLIT_BUILD_NUMBER else "") +AUTOSPLIT_VERSION = "2.3.1" + (f"-{AUTOSPLIT_BUILD_NUMBER}" if AUTOSPLIT_BUILD_NUMBER else "") """AutoSplit Version number""" GITHUB_REPOSITORY = AUTOSPLIT_GITHUB_REPOSITORY