JuneStepp · JuneStepp · Dec 31, 2025 · Nov 5, 2025 · Nov 5, 2025 · Nov 6, 2025
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,7 +1,6 @@
-name: build
+name: Build
 
-permissions:
-  contents: write # For making release
+permissions: {}
 
 on:
   push:
@@ -11,102 +10,185 @@ on:
 
 jobs:
   build:
-    name: Build for ${{ matrix.os }}
+    name: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-latest]
+        os: [ubuntu-22.04, macos-14, macos-15-intel, windows-latest]
         include:
           - os: ubuntu-22.04
             artifact_path_name: onelauncher.bin
             artifact_rename: OneLauncher-Linux.bin
+          - os: macos-14
+            artifact_path_name: onelauncher.zip
+            artifact_rename: OneLauncher-macOS-ARM64.zip
+          - os: macos-15-intel
+            artifact_path_name: onelauncher.zip
+            artifact_rename: OneLauncher-macOS-x86_64.zip
           - os: windows-latest
             artifact_path_name: OneLauncher.msi
             artifact_rename: OneLauncher-Windows.msi
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        with:
+          persist-credentials: false
 
       # `run_patch_client` C code
       - name: Install mingw-w64 on Linux
         if: runner.os == 'Linux'
         run: sudo apt-get install mingw-w64
+      - name: Install mingw-w64 on macOS
+        if: runner.os == 'macOS'
+        run: brew install mingw-w64
       - name: Build `run_patch_client`
         if: runner.os != 'Windows'
         run: make -C src/run_patch_client
       - name: Install mingw-w64 on Windows
         if: runner.os == 'Windows'
-        uses: msys2/setup-msys2@v2
+        uses: msys2/setup-msys2@4f806de0a5a7294ffabaff804b38a9b435a73bda # v2.30.0
         with:
           msystem: MINGW32
           install: mingw-w64-i686-toolchain make
       - name: Build `run_patch_client` on Windows
         if: runner.os == 'Windows'
         shell: msys2 {0}
         run: make -C src/run_patch_client
+      - name: Move `run_ptch_client` to `onelauncher/external` dir
+        run: mv src/run_patch_client/run_ptch_client.exe src/onelauncher/external/
+
+      # innoextract
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        if: runner.os != 'Windows'
+        with:
+          repository: dscharrer/innoextract
+          ref: 6e9e34ed0876014fdb46e684103ef8c3605e382e
+          path: innoextract
+          persist-credentials: false
+      - name: Patch innoextract to fix build with boost 1.89.0
+        if: runner.os != 'Windows'
+        run: |
+          pushd innoextract
+
+          curl https://github.com/dscharrer/innoextract/commit/882796e0e9b134b02deeaae4bbfe92920adb6fe2.patch \
+            | git apply
+
+          popd
+      - name: Install innoextract dependencies on Linux
+        if: runner.os == 'Linux'
+        run: sudo apt-get install libboost-all-dev liblzma-dev
+      - name: Install innoextract dependencies on macOS
+        if: runner.os == 'macOS'
+        run: brew install boost
+      - name: Build innoextract on macOS
+        if: runner.os == 'macOS'
+        run: |
+          mkdir innoextract/build
+          pushd innoextract/build
 
-      # uv
+          LDFLAGS="-L$(brew --prefix zstd)/lib -L$(brew --prefix icu4c@78)/lib" cmake ..
+          make
+
+          popd
+          ln -s $PWD/innoextract/build/innoextract src/onelauncher/external/innoextract
+      - name: Build innoextract on Linux
+        if: runner.os == 'Linux'
+        run: |
+          mkdir innoextract/build
+          pushd innoextract/build
+
+          cmake .. -DUSE_STATIC_LIBS=ON
+          make
+
+          popd
+          ln -s $PWD/innoextract/build/innoextract src/onelauncher/external/innoextract
+
+      # Python
       # Can't use uv python with Nuitka yet
       # See https://github.com/Nuitka/Nuitka/issues/3331
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
         with:
-          python-version: "3.11"
+          python-version-file: "pyproject.toml"
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
         with:
           activate-environment: true
       - run: uv sync --locked --no-dev --group build
 
-      # Nuitka cache
-      - name: Install ccache for Nuitka
+      # Nuitka cache. Based on <https://github.com/Nuitka/Nuitka-Action/blob/main/action.yml>.
+      - name: Install ccache for Nuitka on Linux
         if: runner.os == 'Linux'
         run: sudo apt-get install -y ccache
+      - name: Install ccache for Nuitka on MacOS
+        if: runner.os == 'macOS'
+        run: brew install ccache
       - name: Setup Nuitka env variables
         shell: bash
         run: |
           echo "NUITKA_CACHE_DIR=nuitka/cache" >> $GITHUB_ENV
           echo "PYTHON_VERSION=$(python --version | awk '{print $2}' | cut -d '.' -f 1,2)" >> $GITHUB_ENV
       - name: Cache Nuitka cache directory
         if: ${{ !inputs.disable-cache }}
-        uses: actions/cache@v4
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
         with:
           path: ${{ env.NUITKA_CACHE_DIR }}
-          key: ${{ runner.os }}-${{ runner.arch }}-python-${{ env.PYTHON_VERSION }}-nuitka-${{ github.sha }}
+          key: nuitka-caching-${{ runner.os }}-${{ runner.arch }}-python-${{ env.PYTHON_VERSION }}-nuitka-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-python-${{ env.PYTHON_VERSION }}-
-            ${{ runner.os }}-${{ runner.arch }}-python-
-            ${{ runner.os }}-${{ runner.arch }}-
+            nuitka-caching-${{ runner.os }}-${{ runner.arch }}-python-${{ env.PYTHON_VERSION }}-
+            nuitka-${{ runner.os }}-${{ runner.arch }}-python-${{ env.PYTHON_VERSION }}-
+            nuitka-${{ runner.os }}-${{ runner.arch }}-
 
       - name: Setup dotnet for building Windows installer
         if: runner.os == 'Windows'
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
         with:
           dotnet-version: 8.0.x
 
       - name: Build
         run: python -m build
+      - name: Verify build
+        shell: bash
+        run: |
+          if [ "${{ runner.os }}" == "macOS" ]; then
+            distDir="build/out/onelauncher.app/Contents/MacOS"
+          else
+            distDir="build/out/onelauncher.dist"
+          fi
+
+          test -x $distDir/onelauncher/external/run_ptch_client.exe && \
+            echo run_ptch_client.exe found
+
+          if [ "${{ runner.os }}" != "Windows" ]; then
+            test -x $distDir/onelauncher/external/innoextract && \
+              echo innoextract found
+          fi
+      - name: Make app zip on MacOS
+        if: runner.os == 'macOS'
+        run: ditto -c -k --sequesterRsrc --keepParent build/out/onelauncher.app build/out/onelauncher.zip
       - name: Rename artifact
         run: mv build/out/${{ matrix.artifact_path_name }} build/out/${{ matrix.artifact_rename }}
       - name: Upload build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: ${{ matrix.artifact_rename }}
           path: build/out/${{ matrix.artifact_rename }}
           if-no-files-found: error
   release:
-    # Only make a release for new tags
+    # Only make a release for new tags.
     if: startsWith(github.ref, 'refs/tags/')
     needs: [build]
     runs-on: ubuntu-latest
     name: Make draft release and upload artifacts
+    permissions:
+      contents: write # For making the release.
     steps:
       - name: Download build artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           path: build_artifacts/
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5 # v2.4.0
         with:
           draft: true
           fail_on_unmatched_files: true

diff --git a/.github/workflows/status_checks.yml b/.github/workflows/status_checks.yml
@@ -0,0 +1,44 @@
+name: Status checks
+on:
+  push:
+  pull_request:
+
+permissions: {}
+
+jobs:
+  status_checks:
+    name: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, macos-15-intel, windows-latest]
+
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        with:
+          persist-credentials: false
+
+      - name: Install Python
+        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+        with:
+          python-version-file: "pyproject.toml"
+      - name: Install uv
+        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        with:
+          activate-environment: true
+      - run: uv sync --locked
+
+      - name: Install PySide6 dependencies on Linux
+        if: runner.os == 'Linux'
+        run: sudo apt-get install libegl1
+
+      - name: Lint
+        run: ruff check --output-format=github
+      - name: Type check
+        run: mypy .
+      - name: Unit test
+        run: pytest
+      - name: Check for spelling mistakes
+        run: typos
+      - name: Check formatting
+        run: ruff format --check --output-format=github
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -1,7 +1,7 @@
 # Credits
 
 Lord of the Rings Online and Dungeons & Dragons Online
-Launcher for Linux, Mac OS X, and Windows.
+Launcher for Linux, macOS, and Windows.
 
 - [OneLauncher](https://github.com/JuneStepp/OneLauncher)
   (C) 2019-2025 June Stepp \<contact@junestepp.me\>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -53,7 +53,7 @@ This update has quite a few small fixes and improvements. The full changelog is
 
 ### Testing
 
-- Add `test_allow_uknown_config_keys`
+- Add `test_allow_unknown_config_keys`
 - Increase strictness of pytest config
 
 ## 2.0.1 (2024-08-03)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -9,13 +9,14 @@ Contributions and questions are always welcome! Here's just a couple of things t
 
 OneLauncher uses [uv](https://docs.astral.sh/uv/getting-started/installation/) for dependency management. Run `uv run onelauncher` in the root folder of this repository to install and start OneLauncher. Alternatively, [Nix can be used](#nix).
 
-For game patching support, extra C code must be compiled. Run `make -C src/run_patch_client` with mingw-w64 installed. Your mingw-w64 installation must have support for i686 builds.
+For game patching support, extra C code must be compiled with mingw-w64. Run `make -C src/run_patch_client && mv src/run_patch_client/run_ptch_client.exe src/onelauncher/external/`. Your mingw-w64 installation must have support for i686 builds.
+innoextract is needed for game installation support.
 
 ### Nix
 
 OneLauncher comes with a [Nix](https://nixos.org/) flake for easily replicating the standard development environment. It can be used with [direnv](https://github.com/direnv/direnv) or the `nix develop` command. 
 
-The compiled builds can be tested on NixOS with `nix run .#fhs-run build/out/onelauncher.bin`.
+The compiled builds can be tested on NixOS with `nix run .#fhs-run build/out/onelauncher.bin`. Similarly, `nix run .#fhs-run onelauncher` can be used while in the development shell to start OneLauncher from source with support for the WINE binaries it downloads.
 
 ## Building