Skip to content

Commit 1da71f9

Browse files
committed
Update build workflows and versioning conventions
- Attempt at fixing `build-linux.yml`. - Adjusted final version string construction in `release.yml` to remove 'v' prefix from base version.
1 parent 3e1a2d2 commit 1da71f9

3 files changed

Lines changed: 36 additions & 19 deletions

File tree

.github/workflows/build-linux.yml

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,50 @@ on:
88
version_string:
99
required: true
1010
type: string
11-
outputs:
12-
artifact_name_linux:
13-
description: "The name of the Linux artifact"
14-
value: ${{ jobs.build.outputs.artifact_name_linux }}
15-
artifact_name_deb:
16-
description: "The name of the Debian artifact"
17-
value: ${{ jobs.build.outputs.artifact_name_deb }}
1811

1912
jobs:
2013
build:
2114
runs-on: ubuntu-latest
22-
outputs:
23-
artifact_name_linux: ${{ steps.upload_linux.outputs.artifact-name }}
24-
artifact_name_deb: ${{ steps.upload_deb.outputs.artifact-name }}
2515
steps:
2616
- name: Checkout code
27-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
2818

29-
- name: Install Dependencies
19+
- name: Set up Python
20+
uses: actions/setup-python@v5
21+
with:
22+
python-version: '3.10'
23+
24+
# --- START DEBUGGING STEPS ---
25+
- name: 1. Verify Python Environment
26+
shell: bash
27+
run: |
28+
echo "--- Python Version ---"
29+
python --version
30+
echo "--- PIP Version ---"
31+
python -m pip --version
32+
echo "--- Location of Python ---"
33+
which python
34+
echo "--- System PATH ---"
35+
echo $PATH
36+
37+
- name: 2. Install System & Python Dependencies
38+
shell: bash
3039
run: |
40+
echo "Installing system packages..."
3141
sudo apt-get update
3242
sudo apt-get install -y make build-essential fakeroot devscripts dh-python python3-all debhelper-compat=13
33-
pip3 install pyinstaller Pillow numpy scipy platformdirs tqdm
43+
echo "Installing Python packages with 'python -m pip'..."
44+
python -m pip install pyinstaller Pillow numpy scipy platformdirs tqdm
45+
46+
- name: 3. Verify Installed Packages
47+
shell: bash
48+
run: |
49+
echo "--- Listing installed packages after install step ---"
50+
python -m pip list
51+
# --- END DEBUGGING STEPS ---
3452

3553
- name: Update Version in Files
54+
shell: bash
3655
run: |
3756
find . -type f -name "*.py" -exec sed -i "s/<unreleased>/${{ inputs.version_string }}/g" {} +
3857
DEBIAN_VERSION=$(echo "${{ inputs.version_string }}" | sed -e 's/v//' -e 's/_/~/g')
@@ -42,15 +61,13 @@ jobs:
4261
run: make lin deb
4362

4463
- name: Upload Linux Artifact
45-
id: upload_linux
4664
uses: actions/upload-artifact@v4
4765
with:
48-
name: linux-build-${{ inputs.version_string }}
66+
name: linux-build-v${{ inputs.version_string }}
4967
path: dist/msxtileforge_linux.tar.gz
5068

5169
- name: Upload Debian Artifact
52-
id: upload_deb
5370
uses: actions/upload-artifact@v4
5471
with:
55-
name: debian-build-${{ inputs.version_string }}
72+
name: debian-build-v${{ inputs.version_string }}
5673
path: dist/*.deb

.github/workflows/build-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ jobs:
6868
uses: actions/upload-artifact@v4
6969
with:
7070
# This will be the name of the final .zip file the user downloads
71-
name: windows-build-${{ inputs.version_string }}
71+
name: msxtileforge-v${{ inputs.version_string }}
7272
# This is the path to the FOLDER that upload-artifact will zip up for us
7373
path: dist/msxtileforge/

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
GLOBAL_BUILD_NUM="${{ github.run_number }}"
5656
echo "6. Parsed GLOBAL_BUILD_NUM (Run Number): $GLOBAL_BUILD_NUM"
5757
58-
FINAL_VERSION="v${BASE_VERSION}_dev${TICKET_NUM}.${BRANCH_BUILD_NUM}_${GLOBAL_BUILD_NUM}"
58+
FINAL_VERSION="${BASE_VERSION}_dev${TICKET_NUM}.${BRANCH_BUILD_NUM}_${GLOBAL_BUILD_NUM}"
5959
echo "7. Assembled FINAL_VERSION: $FINAL_VERSION"
6060
echo "--- End Version Construction ---"
6161

0 commit comments

Comments
 (0)