Skip to content

Commit 7933bd9

Browse files
committed
Fixing errors in windows and linux scripts.
1 parent 220b694 commit 7933bd9

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/build-linux.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ jobs:
3535
- name: Update Version in Files
3636
run: |
3737
find . -type f -name "*.py" -exec sed -i "s/<unreleased>/${{ inputs.version_string }}/g" {} +
38-
sed -i "s/<unreleased>/${{ inputs.version_string }}/g" debian/changelog
38+
DEBIAN_VERSION=$(echo "${{ inputs.version_string }}" | sed -e 's/v//' -e 's/_/~/g')
39+
sed -i "s/<unreleased>/$DEBIAN_VERSION/g" debian/changelog
3940
4041
- name: Build Linux Binary and Debian Package
4142
run: make lin deb

.github/workflows/build-windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ jobs:
3333
shell: bash
3434
run: find . -type f -name "*.py" -exec sed -i "s/<unreleased>/${{ inputs.version_string }}/g" {} +
3535

36-
- name: Build Windows Binary
37-
# We need to use 'py -m' on Windows to ensure we're using the Python from setup-python
36+
- name: Build Windows Binary
37+
# This replaces the old 'run: make win' line
38+
shell: cmd
3839
run: |
3940
py -m PyInstaller --noconsole --onedir --clean ^
4041
--add-data "msxtileexport.py;." ^
4142
--add-data "msxtilemagic.py;." ^
4243
--add-data "tilerandomizer.py;." ^
4344
--add-data "superfilerandomizer.py;." ^
4445
msxtileforge.py
45-
cp README.md LICENSE dist/msxtileforge/
46+
copy README.md LICENSE dist\msxtileforge\
4647
cd dist
4748
7z a msxtileforge_windows.zip msxtileforge
48-
shell: cmd
4949
5050
- name: Upload Windows Artifact
5151
id: upload

0 commit comments

Comments
 (0)