Skip to content

Commit 680bc30

Browse files
committed
Merge branch 'main' of https://github.com/Toufool/AutoSplit
2 parents c4fa1de + 20978b1 commit 680bc30

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/lint-and-build.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,10 @@ jobs:
7777
os: [windows-latest, ubuntu-22.04]
7878
python-version: ["3.13"]
7979
include:
80-
# I had some Qt Wayland issues on 3.12 for ubuntu-22.04 iirc. TODO: test it
80+
# I had some Qt Wayland issues on 3.12 for ubuntu-22.04
81+
# This should be fixed with QT_QPA_PLATFORM=xcb, but keeping it until next major upgrade
8182
- os: ubuntu-22.04
8283
python-version: "3.11"
83-
- os: ubuntu-22.04
84-
python-version: "3.12"
8584
steps:
8685
- uses: actions/checkout@v4
8786
- name: Set up uv for Python ${{ matrix.python-version }}
@@ -109,10 +108,19 @@ jobs:
109108
shell: pwsh
110109
- name: Add empty profile
111110
run: echo "" > dist/settings.toml
111+
- name: Extract AutoSplit version
112+
id: autosplit_version
113+
working-directory: src
114+
run: |
115+
$Env:AUTOSPLIT_VERSION=uv run python -c "import utils; print(utils.AUTOSPLIT_VERSION)"
116+
echo "AUTOSPLIT_VERSION=$Env:AUTOSPLIT_VERSION" >> $Env:GITHUB_OUTPUT
117+
shell: pwsh
112118
- name: Upload Build Artifact
113119
uses: actions/upload-artifact@v4
114120
with:
115-
name: AutoSplit for ${{ matrix.os }} (Python ${{ matrix.python-version }})
121+
name: >
122+
AutoSplit v${{ steps.autosplit_version.outputs.AUTOSPLIT_VERSION }}
123+
for ${{ matrix.os }} (Python ${{ matrix.python-version }})
116124
path: |
117125
dist/AutoSplit*
118126
dist/settings.toml

src/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,6 @@ def run_tesseract(png: bytes):
313313

314314
# Shared strings
315315
# Check `excludeBuildNumber` during workflow dispatch build generate a clean version number
316-
AUTOSPLIT_VERSION = "2.3.0" + (f"-{AUTOSPLIT_BUILD_NUMBER}" if AUTOSPLIT_BUILD_NUMBER else "")
316+
AUTOSPLIT_VERSION = "2.3.1" + (f"-{AUTOSPLIT_BUILD_NUMBER}" if AUTOSPLIT_BUILD_NUMBER else "")
317317
"""AutoSplit Version number"""
318318
GITHUB_REPOSITORY = AUTOSPLIT_GITHUB_REPOSITORY

0 commit comments

Comments
 (0)