Skip to content

Commit

Permalink
Merge pull request #190 from Dpeta/test-2.7
Browse files Browse the repository at this point in the history
Changelog + workflow changes for silly 2.7 dev build
  • Loading branch information
Dpeta authored Dec 24, 2024
2 parents 8673c41 + e557446 commit 8f38cbc
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 17 deletions.
56 changes: 41 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: PyInstaller builds
on: [push, workflow_dispatch]

jobs:
build_ubuntu64_20:
runs-on: ubuntu-20.04
build_ubuntu64_22:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Setup Python 3.11 x64
- name: Setup Python 3.13 x64
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.13'
architecture: 'x64'
- name: Update pip
run: python -m pip install --upgrade pip
Expand All @@ -23,20 +23,46 @@ jobs:
- name: Run pyinst.py
run: python3 pyinst.py --no-prompts --onefile --no-upx --no-crt --no-clean --windowed
- name: Create archive (.tar.xz)
run: tar -cavf Pesterchum_linux64.tar.xz -C dist Pesterchum
run: tar -cavf Pesterchum_linux64_glibc2-35+.tar.xz -C dist Pesterchum
- uses: actions/upload-artifact@v4
with:
name: Pesterchum_linux64.tar.xz
path: Pesterchum_linux64.tar.xz
name: Pesterchum_linux64_glibc2-35+.tar.xz
path: Pesterchum_linux64_glibc2-35+.tar.xz

build_ubuntu64_24:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Setup Python 3.13 x64
uses: actions/setup-python@v5
with:
python-version: '3.13'
architecture: 'x64'
- name: Update pip
run: python -m pip install --upgrade pip
- name: Update builds tools
run: python -m pip install --upgrade setuptools wheel
- name: Install dependencies
run: python -m pip install -r requirements.txt
- name: Install PyInstaller
run: python -m pip install --upgrade PyInstaller
- name: Run pyinst.py
run: python3 pyinst.py --no-prompts --onefile --no-upx --no-crt --no-clean --windowed
- name: Create archive (.tar.xz)
run: tar -cavf Pesterchum_linux64_glibc2-39+.tar.xz -C dist Pesterchum
- uses: actions/upload-artifact@v4
with:
name: Pesterchum_linux64_glibc2-39+.tar.xz
path: Pesterchum_linux64_glibc2-39+.tar.xz

build_win64_310:
runs-on: windows-2019
steps:
- uses: actions/checkout@v4
- name: Setup Python 3.11 x64
- name: Setup Python 3.13 x64
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.13'
architecture: 'x64'
- name: Update pip
run: python -m pip install --upgrade pip
Expand Down Expand Up @@ -81,23 +107,23 @@ jobs:
name: Pesterchum_win32_py38.zip
path: Pesterchum_win32_py38.zip

build_macos64_12:
runs-on: macos-12
build_macos64_13:
runs-on: macos-13
steps:
- uses: actions/checkout@v4
- name: Setup Python 3.11 x64
- name: Setup Python 3.10 x64
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.10'
architecture: 'x64'
- name: Update pip
run: python -m pip install --upgrade pip
- name: Update builds tools
run: python -m pip install --upgrade setuptools wheel
- name: Install dependencies
run: python -m pip install -r requirements.txt
run: python -m pip install certifi PyQt6==6.7.1
- name: Install PyInstaller
run: python -m pip install --upgrade PyInstaller
run: python -m pip install PyInstaller==5.7.0
- name: Run pyinst.py
run: python3 pyinst.py --no-prompts --onefile --no-upx --no-crt --no-clean --windowed
- name: Create archive (.tar.xz)
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
# Changelog
(This document uses YYYY-MM-DD)

## [v2.7.0] - 2024-12-24

### Added
- Theme repository works now!! woo yeah woo yeah (by [mocchapi](https://github.com/mocchapi) https://github.com/Dpeta/pesterchum-alt-servers/pull/169)
- Chat image embeds (by [mocchapi](https://github.com/mocchapi) https://github.com/Dpeta/pesterchum-alt-servers/pull/184)
- Update checker + memo report option (by [maloryware](https://github.com/maloryware) https://github.com/Dpeta/pesterchum-alt-servers/pull/170)

### Fix
- Sort theme list case-insensitively (by [mocchapi](https://github.com/mocchapi) https://github.com/Dpeta/pesterchum-alt-servers/pull/185)
- An attempt was made to fix the socket issues but skill issue
- "Pesterchum is still running message" appearing always when closing Pesterchum

### Changed
- Classify pesterquirk (by [mocchapi](https://github.com/mocchapi) https://github.com/Dpeta/pesterchum-alt-servers/pull/186)

## [v2.6.0] - 2024-02-08

### Added
Expand Down
4 changes: 2 additions & 2 deletions version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
_pcVersion = "Alt. v2.6.0"
buildVersion = "v2.6.0"
_pcVersion = "Alt. v2.7.0 (dev)"
buildVersion = "v2.7.0"

0 comments on commit 8f38cbc

Please sign in to comment.