Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup project files #487

Merged
merged 40 commits into from
Dec 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
949d1fa
rare: remove unused import
loathingKernel Dec 24, 2024
e351ad2
ImageManager: using `with` when opening file for writing
loathingKernel Dec 24, 2024
c910dd8
resources: cleanup
loathingKernel Dec 25, 2024
d62ad4b
requirements: cleanup
loathingKernel Dec 25, 2024
eebe237
project: move project setup to `pyproject.toml`
loathingKernel Dec 25, 2024
daa12ac
project: manage package data with in `pyproject.toml`
loathingKernel Dec 25, 2024
4f078b4
project: use cx-freeze to create AppImage and macOS releases
loathingKernel Dec 26, 2024
ee49849
workflows: set python version to 3.12
loathingKernel Dec 26, 2024
ac28128
freeze.py: fix icon path
loathingKernel Dec 26, 2024
16587b5
freeze: build dmg through cx-freeze
loathingKernel Dec 26, 2024
c456d7b
workflows: use debian container to build `deb` package
loathingKernel Dec 26, 2024
c7cc6dc
workflows: update debian container
loathingKernel Dec 26, 2024
9e74a8c
workflows: fix debian/macos workflows
loathingKernel Dec 26, 2024
60a3de5
workflows: use apt-get
loathingKernel Dec 26, 2024
9074851
workflows: remove separate `x86_64`/`arm64` builds for macOS
loathingKernel Dec 26, 2024
93b5b20
workflows: install git in debian workflow
loathingKernel Dec 26, 2024
5c3ade2
workflows: use MPR debian image
loathingKernel Dec 26, 2024
25e9326
workflows: fix permissions
loathingKernel Dec 26, 2024
6f74d72
workflows: disable debian/ubuntu package workflow
loathingKernel Dec 26, 2024
50bd692
workflows: delete old appimage workflow and related files
loathingKernel Dec 26, 2024
b2d1b76
workflows: delete old macOS workflow in favor for cx-freeze
loathingKernel Dec 26, 2024
b5fe591
workflows: delete ubuntu workflow in favor of other packaging methods
loathingKernel Dec 26, 2024
67412da
workflows: delete cx-freeze portable workflow in favor of builds usin…
loathingKernel Dec 26, 2024
150adc1
workflows: use target package name for macOS cx-freeze workflow
loathingKernel Dec 26, 2024
ac2bb03
workflows: use macos-13 for cx-freeze dmg
loathingKernel Dec 26, 2024
ddea2f8
workflows: use create-dmg to create dmg package instead of cx-freeze
loathingKernel Dec 26, 2024
9d9f6a7
workflows: update nuitka builds
loathingKernel Dec 26, 2024
40d6b3e
workflows: update nuitka file description
loathingKernel Dec 26, 2024
dad5cf6
packaging: update nuitka scripts
loathingKernel Dec 27, 2024
7abe23d
cxfreeze: use bdist_dmg again, use python 3.13 for macos, excude qpdf…
loathingKernel Dec 27, 2024
07fa695
packaging: update nuitka scripts
loathingKernel Dec 27, 2024
422ed54
workflows: python 3.12 doesn't work with cxfreeze
loathingKernel Dec 27, 2024
a4f7bdc
project: split packaging and dev dependencies
loathingKernel Dec 27, 2024
fe3d385
project: update version information using setuptools-scm
loathingKernel Dec 28, 2024
7dbc2c7
workflows: unshallow checkout
loathingKernel Dec 28, 2024
107061d
rare: properly import version module
loathingKernel Dec 28, 2024
ab04436
GameLaunchSettings: add a few more valid extensions for override_exe
loathingKernel Dec 28, 2024
b83d120
setuptools: fix versioning
loathingKernel Dec 28, 2024
6b6de7e
setuptools: add barebones `setup.py` to use custom version scheme
loathingKernel Dec 28, 2024
092dba1
project: move requirements files under misc
loathingKernel Dec 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions .github/workflows/job_appimage.yml

This file was deleted.

47 changes: 47 additions & 0 deletions .github/workflows/job_cx-freeze-appimage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: job_cx-freeze-appimage

on:
workflow_call:
inputs:
version:
required: true
type: string

jobs:
build:
name: Package
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install build dependencies
run: |
sudo apt update
sudo apt install patchelf fakeroot
- uses: actions/setup-python@v5
with:
cache: pip
python-version: '3.12'
check-latest: true
architecture: x64
- name: Install build dependencies
run: |
pip3 install --upgrade cx_freeze
- name: Install target dependencies
run: |
pip3 install -r misc/requirements.in
- name: Generate version information
run: |
pip3 install setuptools-scm
python3 -m setuptools_scm --force-write-version-files
- name: Build
run: |
python3 freeze.py bdist_appimage
mv dist/Rare-*.AppImage Rare.AppImage

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: Rare-${{ inputs.version }}.AppImage
path: Rare.AppImage
43 changes: 43 additions & 0 deletions .github/workflows/job_cx-freeze-dmg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: job_cx-freeze-macos

on:
workflow_call:
inputs:
version:
required: true
type: string

jobs:
build:
name: Package
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v5
with:
cache: pip
python-version: '3.12'
check-latest: true
architecture: x64
- name: Install build dependencies
run: |
pip3 install --upgrade cx_freeze
- name: Install target dependencies
run: |
pip3 install -r misc/requirements.in
- name: Generate version information
run: |
pip3 install setuptools-scm
python3 -m setuptools_scm --force-write-version-files
- name: Build
run: |
python3 freeze.py bdist_dmg
mv build/Rare.dmg Rare.dmg

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: Rare-${{ inputs.version }}.dmg
path: Rare.dmg
17 changes: 11 additions & 6 deletions .github/workflows/job_cx-freeze-msi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,35 @@ on:

jobs:
build:
name: Build
name: Package
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v5
with:
cache: pip
python-version: '3.12'
check-latest: true
architecture: x64
- name: Install build dependencies
run: pip3 install --upgrade cx_freeze wheel
run: |
pip3 install --upgrade cx_freeze
- name: Install target dependencies
run: |
pip3 install -r requirements.txt
pip3 install -r requirements-presence.txt
pip3 install -r misc/requirements.in
- name: Generate version information
run: |
pip3 install setuptools-scm
python3 -m setuptools_scm --force-write-version-files
- name: Build
run: |
python freeze_msi.py bdist_msi
python3 freeze.py bdist_msi
mv dist/*.msi Rare.msi

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: Rare-${{ inputs.version }}.msi
path: Rare.msi

47 changes: 0 additions & 47 deletions .github/workflows/job_cx-freeze-zip.yml

This file was deleted.

47 changes: 0 additions & 47 deletions .github/workflows/job_macos.yml

This file was deleted.

31 changes: 17 additions & 14 deletions .github/workflows/job_nuitka-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,27 @@ on:

jobs:
build:
name: Build
name: Package
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v5
with:
cache: pip
python-version: '3.13'
python-version: '3.12'
check-latest: true
architecture: x64
- name: Install build dependencies
run: pip3 install nuitka ordered-set
run: pip3 install nuitka
- name: Install target dependencies
run: |
pip3 install -r requirements.txt
pip3 install -r requirements-presence.txt
pip3 install -r misc/requirements.in
- name: Generate version information
run: |
pip3 install setuptools-scm
python3 -m setuptools_scm --force-write-version-files
- name: Build
run: >-
python -m nuitka
Expand Down Expand Up @@ -53,23 +58,21 @@ jobs:
--include-package-data=qtawesome
--include-data-dir=rare/resources/images/=rare/resources/images/
--include-data-files=rare/resources/languages/rare_*.qm=rare/resources/languages/
--windows-icon-from-ico=rare/resources/images/Rare.png
--windows-company-name=RareDevs
--windows-product-name=Rare
--windows-file-description=rare.exe
--windows-file-version=${{ inputs.version }}
--windows-product-version=${{ inputs.version }}
--windows-console-mode=disable
--output-filename=Rare.bin
--file-description=Rare.bin
--company-name=RareDevs
--product-name=Rare
--file-version=${{ inputs.version }}
--product-version=${{ inputs.version }}
rare
- name: Compress
run: |
find rare.dist -iname "*.so*" -type f -exec strip --strip-all {} \;
strip --strip-all rare.dist/rare.bin
strip --strip-all rare.dist/Rare.bin
python -c "import shutil; shutil.make_archive('Rare', 'zip', 'rare.dist')"

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: Rare-portable-linux-${{ inputs.version }}.zip
path: Rare.zip

Loading
Loading