Merge d86830028e into 01807fedc9

fix(ModSource): fix bad unwrap in fetchValidTags
fix wrong type in Task::chain impl
2024-11-14 02:54:58 -05:00 · 2024-11-14 00:29:58 +01:00 · 2024-11-13 23:19:07 +02:00 · 2024-11-13 16:20:50 -03:00 · 2024-11-13 19:48:47 +02:00 · 2024-11-13 13:38:10 -03:00
12 changed files with 322 additions and 297 deletions
--- a/.github/actions/build-debug-info-post/action.yml
+++ b/.github/actions/build-debug-info-post/action.yml
@ -1,4 +1,4 @@
-name: Prepare for Build Debug Info
+name: Prepare for Build Debug Info
 description: Provides debug info for the build process

 inputs:
@ -9,25 +9,33 @@ inputs:
 runs:
  using: "composite"
  steps:
-  - name: Preprocess
-    shell: bash
-    run: |
-      mkdir build-debug-info-preprocessed
-      cd build
-      sed 's/\\\\/\//g' compile_commands.json | sed 's/D:\//\/d\//' > uni_compile_commands.json
-      pip install compile-commands --break-system-packages
-      compile-commands --file=uni_compile_commands.json --filter_files='.*info\.rc.*' --filter='(.*) -o (.*)((?:/|\\).*)\.(?:obj|o) -c (.*)' --replacement="$BASH"' --noprofile --norc -c "mkdir -p ../build-debug-info-preprocessed/\g<2> && \g<1> -o ../build-debug-info-preprocessed/\g<2>\g<3>.i -E \g<4>"' -o ../build-debug-info/preprocess_commands.json --run --verbose
+    - name: Preprocess
+      shell: bash
+      run: |
+        mkdir build-debug-info-preprocessed
+        cd build
+        sed 's/\\\\/\//g' compile_commands.json | sed 's/D:\//\/d\//' > uni_compile_commands.json
+        pip install compile-commands --break-system-packages
+        compile-commands --file=uni_compile_commands.json \
+          --filter_files='.*info\.rc.*' \
+          --filter='(.*) -o (.*)((?:/|\\).*)\.(?:obj|o) -c (.*)' \
+          --replacement="$BASH" \
+          --noprofile --norc -c "\
+            mkdir -p ../build-debug-info-preprocessed/\g<2> && \
+            \g<1> -o ../build-debug-info-preprocessed/\g<2>\g<3>.i -E \g<4>"' \
+          -o ../build-debug-info/preprocess_commands.json \
+          --run --verbose

-  - name: Upload Build Debug Info
-    uses: actions/upload-artifact@v4
-    with:
-      name: geode-build-debug-info-${{ inputs.target }}
-      path: ./build-debug-info/*
-    if: success() || failure()
+    - name: Upload Build Debug Info
+      uses: actions/upload-artifact@v4
+      with:
+        name: geode-build-debug-info-${{ inputs.target }}
+        path: ./build-debug-info/*
+      if: success() || failure()

-  - name: Upload Preprocessed Files
-    uses: actions/upload-artifact@v4
-    with:
-      name: geode-build-debug-info-preprocessed-${{ inputs.target }}
-      path: ./build-debug-info-preprocessed/*
-    if: success() || failure()
+    - name: Upload Preprocessed Files
+      uses: actions/upload-artifact@v4
+      with:
+        name: geode-build-debug-info-preprocessed-${{ inputs.target }}
+        path: ./build-debug-info-preprocessed/*
+      if: success() || failure()
--- a/.github/actions/build-debug-info/action.yml
+++ b/.github/actions/build-debug-info/action.yml
@ -1,16 +1,18 @@
-name: Prepare for Build Debug Info
+name: Prepare for Build Debug Info
 description: Provides debug info for the build process

 inputs:
  has-sccache:
    description: 'Whether the build action has sccache'
    required: true
+
 outputs:
  extra-configure:
    description: 'Extra stuff for CMake configure step'
    value: |
      -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
      cp ./build/compile_commands.json ./build-debug-info/
+
  extra-build:
    description: 'Extra stuff for CMake build step'
    value: |
@ -20,17 +22,17 @@ outputs:
 runs:
  using: "composite"
  steps:
-  - name: Prepare
-    shell: bash
-    run: |
-      mkdir ./build-debug-info
-      echo "SCCACHE_ERROR_LOG=$GITHUB_WORKSPACE/build-debug-info/sccache-log.txt" >> $GITHUB_ENV
-      echo "SCCACHE_LOG=debug" >> $GITHUB_ENV
-      echo "RUST_BACKTRACE=1" >> $GITHUB_ENV
+    - name: Prepare
+      shell: bash
+      run: |
+        mkdir ./build-debug-info
+        echo "SCCACHE_ERROR_LOG=$GITHUB_WORKSPACE/build-debug-info/sccache-log.txt" >> $GITHUB_ENV
+        echo "SCCACHE_LOG=debug" >> $GITHUB_ENV
+        echo "RUST_BACKTRACE=1" >> $GITHUB_ENV

-  - name: Checkout ninjatracing
-    uses: actions/checkout@v4
-    with:
-      repository: 'nico/ninjatracing'
-      path: ninjatracing
-      submodules: recursive
+    - name: Checkout ninjatracing repository
+      uses: actions/checkout@v4
+      with:
+        repository: 'nico/ninjatracing'
+        path: ninjatracing
+        submodules: recursive
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -16,8 +16,8 @@ on:
  pull_request:
  push:
    branches:
-    - '**'              # every branch
-    - '!no-build-**'    # unless marked as no-build
+      - '**'              # every branch
+      - '!no-build-**'    # unless marked as no-build

 env:
  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
@ -36,103 +36,101 @@ jobs:
    runs-on: ubuntu-24.04

    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive

-    - name: Prepare for Build Debug Info
-      id: build-debug-info
-      uses: ./.github/actions/build-debug-info
-      with:
-        has-sccache: ${{ inputs.use-ccache }}
-      if: inputs.build-debug-info
+      - name: Prepare for Build Debug Info
+        id: build-debug-info
+        uses: ./.github/actions/build-debug-info
+        with:
+          has-sccache: ${{ inputs.use-ccache }}
+        if: inputs.build-debug-info

-    - name: Setup caches
-      uses: ./.github/actions/setup-cache
-      with:
-        host: linux
-        target: win
-        use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}
+      - name: Setup caches
+        uses: ./.github/actions/setup-cache
+        with:
+          host: linux
+          target: win
+          use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}

-    - name: Setup Ninja
-      uses: ./.github/actions/setup-ninja
-      with:
-        host: linux
+      - name: Setup Ninja
+        uses: ./.github/actions/setup-ninja
+        with:
+          host: linux

-    - name: Setup CLI
-      uses: geode-sdk/cli/.github/actions/setup@main
+      - name: Setup CLI
+        uses: geode-sdk/cli/.github/actions/setup@main

-    - name: Download xwin
-      uses: robinraju/release-downloader@v1.10
-      with:
-        repository: Jake-Shadle/xwin
-        latest: true
-        fileName: 'xwin-*-x86_64-unknown-linux-musl.tar.gz'
-        tarBall: false
-        zipBall: false
-        out-file-path: "epic-xwin"
+      - name: Download xwin
+        uses: robinraju/release-downloader@v1
+        with:
+          repository: Jake-Shadle/xwin
+          latest: true
+          fileName: 'xwin-*-x86_64-unknown-linux-musl.tar.gz'
+          tarBall: false
+          zipBall: false
+          out-file-path: "epic-xwin"

-    - name: Prepare xwin
-      run: |
-        tar -xzf epic-xwin/xwin-*-x86_64-unknown-linux-musl.tar.gz -C epic-xwin
-        mv epic-xwin/xwin-*-x86_64-unknown-linux-musl/xwin ./xwin
-        ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license list
+      - name: Prepare xwin
+        run: |
+          tar -xzf epic-xwin/xwin-*-x86_64-unknown-linux-musl.tar.gz -C epic-xwin
+          mv epic-xwin/xwin-*-x86_64-unknown-linux-musl/xwin ./xwin
+          ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license list

-    # this caches '.xwin-cache/**/*' but that's actually only gonna
-    # contain the manifest cuz we only ran `xwin list` so far
-    - name: Setup xwin Cache
-      id: xwin-cache
-      uses: actions/cache@v4
-      with:
-        path: .xwin-cache
-        key: xwin-win-v1-${{ hashFiles('.xwin-cache/**/*') }}
+      - name: Setup xwin Cache
+        id: xwin-cache
+        uses: actions/cache@v4
+        with:
+          path: .xwin-cache
+          key: xwin-win-v1-${{ hashFiles('.xwin-cache/**/*') }}

-    - name: Download Windows headers
-      run: ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license splat --include-debug-libs
-      if: steps.xwin-cache.outputs.cache-hit != 'true'
+      - name: Download Windows headers
+        run: ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license splat --include-debug-libs
+        if: steps.xwin-cache.outputs.cache-hit != 'true'

-    - name: Download clang-msvc-sdk toolchain
-      uses: actions/checkout@v4
-      with:
-        repository: 'geode-sdk/clang-msvc-sdk'
-        path: toolchain
-        submodules: recursive
+      - name: Download clang-msvc-sdk toolchain
+        uses: actions/checkout@v4
+        with:
+          repository: 'geode-sdk/clang-msvc-sdk'
+          path: toolchain
+          submodules: recursive

-    - name: Configure
-      run: ${{ env.base-configure-command }} -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN ${{ steps.build-debug-info.outputs.extra-configure }}
-      env:
-        SPLAT_DIR: ${{ github.workspace }}/.xwin-cache/splat
-        TOOLCHAIN: ${{ github.workspace }}/toolchain/clang-msvc.cmake
-        HOST_ARCH: x86_64
+      - name: Configure
+        run: ${{ env.base-configure-command }} -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN ${{ steps.build-debug-info.outputs.extra-configure }}
+        env:
+          SPLAT_DIR: ${{ github.workspace }}/.xwin-cache/splat
+          TOOLCHAIN: ${{ github.workspace }}/toolchain/clang-msvc.cmake
+          HOST_ARCH: x86_64

-    - name: Build
-      run: |
-        ${{ env.base-build-command }}
-        ${{ steps.build-debug-info.outputs.extra-build }}
+      - name: Build
+        run: |
+          ${{ env.base-build-command }}
+          ${{ steps.build-debug-info.outputs.extra-build }}

-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: geode-win
-        path: ./bin/nightly
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: geode-win
+          path: ./bin/nightly

-    - name: Package Installer
-      run: |
-        sudo apt install nsis
-        makensis -WX -V3 ./installer/windows/installer.nsi
+      - name: Package installer
+        run: |
+          sudo apt install nsis
+          makensis -WX -V3 ./installer/windows/installer.nsi

-    - name: Upload Installer
-      uses: actions/upload-artifact@v4
-      with:
-        name: geode-installer-win
-        path: './installer/windows/geode-installer-win.exe'
+      - name: Upload installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: geode-installer-win
+          path: './installer/windows/geode-installer-win.exe'

-    - name: Complete Build Debug Info
-      uses: ./.github/actions/build-debug-info-post
-      with:
-        target: win
-      if: inputs.build-debug-info && (success() || failure())
+      - name: Complete Build Debug Info
+        uses: ./.github/actions/build-debug-info-post
+        with:
+          target: win
+        if: inputs.build-debug-info && (success() || failure())

  build-mac:
    name: Build macOS
@ -142,213 +140,211 @@ jobs:
      SCCACHE_CACHE_MULTIARCH: 1

    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive

-    - name: Prepare for Build Debug Info
-      id: build-debug-info
-      uses: ./.github/actions/build-debug-info
-      with:
-        has-sccache: ${{ inputs.use-ccache }}
-      if: inputs.build-debug-info
+      - name: Prepare for Build Debug Info
+        id: build-debug-info
+        uses: ./.github/actions/build-debug-info
+        with:
+          has-sccache: ${{ inputs.use-ccache }}
+        if: inputs.build-debug-info

-    # due to very strange performance issues, sccache is currently disabled for macos. sorry
+      # macOS does not currently support sccache due to performance issues
+      # - name: Setup caches
+      #   uses: ./.github/actions/setup-cache
+      #   with:
+      #     host: mac
+      #     target: mac
+      #     use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}

-    # - name: Setup caches
-    #   uses: ./.github/actions/setup-cache
-    #   with:
-    #     host: mac
-    #     target: mac
-    #     use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}
+      - name: Setup Ninja
+        uses: ./.github/actions/setup-ninja
+        with:
+          host: mac

-    - name: Setup Ninja
-      uses: ./.github/actions/setup-ninja
-      with:
-        host: mac
+      - name: Setup CLI
+        uses: geode-sdk/cli/.github/actions/setup@main

-    - name: Setup CLI
-      uses: geode-sdk/cli/.github/actions/setup@main
+      - name: Configure
+        run: >
+          ${{ env.base-configure-command }}
+          -DCMAKE_C_COMPILER=clang
+          -DCMAKE_CXX_COMPILER=clang++
+          -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
+          -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
+          -DGEODE_DISABLE_PRECOMPILED_HEADERS=OFF
+          ${{ steps.build-debug-info.outputs.extra-configure }}

-    - name: Configure
-      run: >
-        ${{ env.base-configure-command }}
-        -DCMAKE_C_COMPILER=clang
-        -DCMAKE_CXX_COMPILER=clang++
-        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
-        -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
-        -DGEODE_DISABLE_PRECOMPILED_HEADERS=OFF
-        ${{ steps.build-debug-info.outputs.extra-configure }}
+      - name: Build
+        run: |
+          ${{ env.base-build-command }}
+          ${{ steps.build-debug-info.outputs.extra-build }}

-    - name: Build
-      run: |
-        ${{ env.base-build-command }}
-        ${{ steps.build-debug-info.outputs.extra-build }}
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: geode-mac
+          path: ./bin/nightly

-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: geode-mac
-        path: ./bin/nightly
+      - name: Package installer
+        run: ./installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg

-    - name: Package Installer
-      run: ./installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg
+      - name: Upload installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: geode-installer-mac
+          path: './installer/mac/geode-installer-mac.pkg'

-    - name: Upload Installer
-      uses: actions/upload-artifact@v4
-      with:
-        name: geode-installer-mac
-        path: './installer/mac/geode-installer-mac.pkg'
-
-    - name: Complete Build Debug Info
-      uses: ./.github/actions/build-debug-info-post
-      with:
-        target: mac
-      if: inputs.build-debug-info && (success() || failure())
+      - name: Complete Build Debug Info
+        uses: ./.github/actions/build-debug-info-post
+        with:
+          target: mac
+        if: inputs.build-debug-info && (success() || failure())

  build-android:
    strategy:
      fail-fast: false
      matrix:
        config:
-        - name: Android (32-bit)
-          id: android32
-          extra-configure: -DANDROID_ABI=armeabi-v7a
-
-        - name: Android (64-bit)
-          id: android64
-          extra-configure: -DANDROID_ABI=arm64-v8a
+          - name: Android (32-bit)
+            id: android32
+            extra-configure: -DANDROID_ABI=armeabi-v7a
+          - name: Android (64-bit)
+            id: android64
+            extra-configure: -DANDROID_ABI=arm64-v8a

    name: Build ${{ matrix.config.name }}
    runs-on: ubuntu-latest

    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive

-    - name: Prepare for Build Debug Info
-      id: build-debug-info
-      uses: ./.github/actions/build-debug-info
-      with:
-        has-sccache: ${{ inputs.use-ccache }}
-      if: inputs.build-debug-info
+      - name: Prepare for Build Debug Info
+        id: build-debug-info
+        uses: ./.github/actions/build-debug-info
+        with:
+          has-sccache: ${{ inputs.use-ccache }}
+        if: inputs.build-debug-info

-    - name: Setup caches
-      uses: ./.github/actions/setup-cache
-      with:
-        host: linux
-        target: ${{ matrix.config.id }}
-        use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}
+      - name: Setup caches
+        uses: ./.github/actions/setup-cache
+        with:
+          host: linux
+          target: ${{ matrix.config.id }}
+          use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}

-    - name: Setup Ninja
-      uses: ./.github/actions/setup-ninja
-      with:
-        host: linux
+      - name: Setup Ninja
+        uses: ./.github/actions/setup-ninja
+        with:
+          host: linux

-    - name: Setup CLI
-      uses: geode-sdk/cli/.github/actions/setup@main
+      - name: Setup CLI
+        uses: geode-sdk/cli/.github/actions/setup@main

-    - name: Setup Breakpad Tools
-      uses: ./.github/actions/setup-dump-sym
-      id: breakpad-tools
+      - name: Setup Breakpad Tools
+        uses: ./.github/actions/setup-dump-sym
+        id: breakpad-tools

-    - name: Fix Ubuntu libcstd++
-      run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get install --only-upgrade libstdc++6
+      - name: Fix Ubuntu libcstd++
+        run: |
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+          sudo apt-get update
+          sudo apt-get install --only-upgrade libstdc++6

-    - name: Configure
-      run: >
-        ${{ env.base-configure-command }}
-        -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake
-        -DCMAKE_C_COMPILER=clang
-        -DCMAKE_CXX_COMPILER=clang++
-        -DANDROID_PLATFORM=android-23
-        -DANDROID_STL=c++_shared
-        ${{ matrix.config.extra-configure }}
-        ${{ steps.build-debug-info.outputs.extra-configure }}
+      - name: Configure
+        run: >
+          ${{ env.base-configure-command }}
+          -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake
+          -DCMAKE_C_COMPILER=clang
+          -DCMAKE_CXX_COMPILER=clang++
+          -DANDROID_PLATFORM=android-23
+          -DANDROID_STL=c++_shared
+          ${{ matrix.config.extra-configure }}
+          ${{ steps.build-debug-info.outputs.extra-configure }}

-    - name: Build
-      run: |
-        ${{ env.base-build-command }}
-        ${{ steps.build-debug-info.outputs.extra-build }}
+      - name: Build
+        run: |
+          ${{ env.base-build-command }}
+          ${{ steps.build-debug-info.outputs.extra-build }}

-    # hardcoding toolchain path :(
-    - name: Dump Symbols
-      run: |
-        ${{ steps.breakpad-tools.outputs.binary-path }} ./bin/nightly/Geode.${{ matrix.config.id }}.so -o ./bin/nightly/Geode.${{ matrix.config.id }}.so.sym
-        $ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip ./bin/nightly/Geode.${{ matrix.config.id }}.so
+      - name: Dump symbols
+        run: |
+          ${{ steps.breakpad-tools.outputs.binary-path }} ./bin/nightly/Geode.${{ matrix.config.id }}.so -o ./bin/nightly/Geode.${{ matrix.config.id }}.so.sym
+          $ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip ./bin/nightly/Geode.${{ matrix.config.id }}.so

-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: geode-${{ matrix.config.id }}
-        path: ./bin/nightly
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: geode-${{ matrix.config.id }}
+          path: ./bin/nightly

-    - name: Complete Build Debug Info
-      uses: ./.github/actions/build-debug-info-post
-      with:
-        target: ${{ matrix.config.id }}
-      if: inputs.build-debug-info && (success() || failure())
+      - name: Complete Build Debug Info
+        uses: ./.github/actions/build-debug-info-post
+        with:
+          target: ${{ matrix.config.id }}
+        if: inputs.build-debug-info && (success() || failure())

  publish:
    name: Publish
    runs-on: ubuntu-latest
    needs: [ build-windows, build-mac, build-android ]
    if: github.ref == 'refs/heads/main'
+
    steps:
-      - name: Checkout
+      - name: Checkout repository
        uses: actions/checkout@v4

-      - name: Declare Version Variables
+      - name: Declare version variables
        id: ref
        run: |
          echo "version=$(cat VERSION | xargs)" >> $GITHUB_OUTPUT
          echo "hash=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT

-      - name: Download Artifacts
+      - name: Download artifacts
        uses: actions/download-artifact@v4

-      - name: Move Installers
+      - name: Move installers
        run: |
          mv geode-installer-mac/geode-installer-mac.pkg geode-installer-${{ steps.ref.outputs.hash }}-mac.pkg
          mv geode-installer-win/geode-installer-win.exe geode-installer-${{ steps.ref.outputs.hash }}-win.exe

-      - name: Zip MacOS Artifacts
+      - name: Zip MacOS artifacts
        uses: vimtor/action-zip@v1.2
        with:
          files: geode-mac/Geode.dylib geode-mac/GeodeBootstrapper.dylib
          dest: geode-${{ steps.ref.outputs.hash }}-mac.zip

-      - name: Zip Windows Artifacts
+      - name: Zip Windows artifacts
        uses: vimtor/action-zip@v1.2
        with:
          files: geode-win/XInput1_4.dll geode-win/Geode.dll geode-win/GeodeUpdater.exe geode-win/Geode.lib geode-win/Geode.pdb
          dest: geode-${{ steps.ref.outputs.hash }}-win.zip

-      - name: Zip Android32 Artifacts
+      - name: Zip Android32 artifacts
        uses: vimtor/action-zip@v1.2
        with:
          files: geode-android32/Geode.android32.so geode-android32/Geode.android32.so.sym
          dest: geode-${{ steps.ref.outputs.hash }}-android32.zip

-      - name: Zip Android64 Artifacts
+      - name: Zip Android64 artifacts
        uses: vimtor/action-zip@v1.2
        with:
          files: geode-android64/Geode.android64.so geode-android64/Geode.android64.so.sym
          dest: geode-${{ steps.ref.outputs.hash }}-android64.zip

-      - name: Zip Resources
+      - name: Zip resources
        uses: vimtor/action-zip@v1.2
        with:
          files: geode-android64/resources
          dest: resources.zip

-      - name: Update Development Release
+      - name: Update development release
        uses: andelf/nightly-release@main
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/check-changelog.yml
+++ b/.github/workflows/check-changelog.yml
@ -1,5 +1,4 @@
-# check the changelog for non ascii characters
-name: Check CHANGELOG.md
+name: Check Changelog

 on:
  push:
@ -11,16 +10,19 @@ on:

 jobs:
  check:
-    name: Check CHANGELOG.md
+    name: Check Changelog
    runs-on: ubuntu-latest
    steps:
-      - name: Checkout
+      - name: Checkout repository
        uses: actions/checkout@v4
        with:
          submodules: recursive
-      
-      - run: |
-          if grep -q -P -n "[\x80-\xFF]" CHANGELOG.md
-          then
-              exit 1;
+
+      - name: Check for non-ASCII characters in changelog
+        run: |
+          if grep -q -P -n "[\x80-\xFF]" CHANGELOG.md; then
+            echo "Non-ASCII characters found in CHANGELOG.md"
+            exit 1
+          else
+            echo "No non-ASCII characters found in CHANGELOG.md"
          fi
--- a/.github/workflows/draft.yml
+++ b/.github/workflows/draft.yml
@ -7,9 +7,10 @@ jobs:
  draft:
    name: Draft Release
    runs-on: ubuntu-latest
+
    steps:
-      - name: Download Development Release
-        uses: robinraju/release-downloader@v1.9
+      - name: Download development release
+        uses: robinraju/release-downloader@v1
        with:
          tag: nightly
          fileName: '*'
@ -17,14 +18,14 @@ jobs:
          zipBall: true
          out-file-path: 'dev'

-      - name: Declare Version Variable
+      - name: Declare version variable
        id: ref
        shell: bash
        run: |
          VERSION=$(unzip -p ${{ github.workspace }}/dev/geode-nightly.zip geode-sdk-geode-*/VERSION | xargs)
          echo "version=$VERSION" >> $GITHUB_OUTPUT

-          # test if release already exists
+          # Test if release already exists
          set +e
          curl --fail "https://api.github.com/repos/geode-sdk/geode/releases/tags/v$VERSION" --silent --output /dev/null
          RESULT=$?
@ -35,7 +36,7 @@ jobs:
            exit 1
          fi

-      - name: Move Files
+      - name: Move files
        run: |
          mv dev/geode-installer-*-win.exe geode-installer-v${{ steps.ref.outputs.version }}-win.exe
          mv dev/geode-installer-*-mac.pkg geode-installer-v${{ steps.ref.outputs.version }}-mac.pkg
@ -45,8 +46,8 @@ jobs:
          mv dev/geode-*-android64.zip geode-v${{ steps.ref.outputs.version }}-android64.zip
          mv dev/resources.zip resources.zip

-      - name: Create Draft Release
-        uses: softprops/action-gh-release@v1
+      - name: Create draft release
+        uses: softprops/action-gh-release@v2
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
@ -54,9 +55,9 @@ jobs:
          name: Geode v${{ steps.ref.outputs.version }}
          body: |
            TODO before publishing:
-             - mark if pre-release
-             - add changelog
-             - remove this
+             - Mark if pre-release
+             - Add changelog
+             - Remove this
          draft: true
          files: |
            ./geode-installer-v${{ steps.ref.outputs.version }}-win.exe
--- a/.github/workflows/update-site.yml
+++ b/.github/workflows/update-site.yml
@ -1,26 +1,22 @@
-# Update the install page on the geode-sdk/website repository
 name: Update Website

 on:
-  # # trigger when a new release is released
-  # release:
-  #   types:
-  #     - released
-
  workflow_dispatch:

 jobs:
  trigger:
    name: Trigger site build
    runs-on: ubuntu-latest
+
    steps:
-    - uses: actions/github-script@v7
-      with:
-        github-token: ${{ secrets.GEODE_BOT_PUSH_BIN_TOKEN }}
-        script: |
-          await github.rest.actions.createWorkflowDispatch({
-            owner: 'geode-sdk',
-            repo: 'website',
-            workflow_id: 'build.yml',
-            ref: 'main'
-          })
+      - name: Trigger build workflow on geode-sdk/website repository
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GEODE_BOT_PUSH_BIN_TOKEN }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: 'geode-sdk',
+              repo: 'website',
+              workflow_id: 'build.yml',
+              ref: 'main'
+            })
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -10,10 +10,9 @@
   * Rewritten matjson library
   * Settings V2 completely removed, use V3 now
   * `JsonChecker` removed
- * Add new system for ordered hook priority (673317d, 6db3084)
-   * See docs: LINK HERE!!
+ * Add new system for ordered hook priority, [see docs](https://docs.geode-sdk.org/tutorials/hookpriority) (673317d, 6db3084)
 * C++20 coroutine support for `geode::Task`, [see docs](https://docs.geode-sdk.org/tutorials/tasks#coroutines) (e61b2c0, ab196b9)
- * Add `Task::chain`, [see docs](https://docs.geode-sdk.org/tutorials/tasks#chaining-tasks)
+ * Add `Task::chain`, [see docs](https://docs.geode-sdk.org/tutorials/tasks#chaining-tasks) (3248831)
 * Single page local mods list (efb1fbf)
 * Split mod problems into load and outdated (12e8bbb, 09fa872, df2528c)
   * This means mods made for outdated gd or geode versions no longer count as actual errors, resulting in less clutter in the ui
--- a/loader/include/Geode/utils/Task.hpp
+++ b/loader/include/Geode/utils/Task.hpp
@ -817,7 +817,7 @@ namespace geode {
                                // make the second event listener that waits for the mapper's task
                                // and just forwards everything through
                                static_cast<void*>(new EventListener<NewTask>(
-                                    [handle](Event* event) mutable {
+                                    [handle](typename NewTask::Event* event) mutable {
                                        if (auto v = event->getValue()) {
                                            NewTask::finish(handle.lock(), std::move(*v));
                                        }
--- a/loader/launcher/windows/proxyLoader.cpp
+++ b/loader/launcher/windows/proxyLoader.cpp
@ -6,6 +6,7 @@

 struct XINPUT_STATE;
 struct XINPUT_CAPABILITIES;
+struct XINPUT_VIBRATION;

 constexpr static auto MAX_PATH_CHARS = 32768u;

@ -41,6 +42,17 @@ extern "C" DWORD XInputGetState(DWORD dwUserIndex, XINPUT_STATE *pState) {
    return ERROR_DEVICE_NOT_CONNECTED;
 }

+#pragma comment(linker, "/export:XInputSetState,@3")
+extern "C" DWORD XInputSetState(DWORD dwUserIndex, XINPUT_VIBRATION* pVibration) {
+    static auto fp = getFP("XInputSetState");
+    if (fp) {
+        using FPType = decltype(&XInputSetState);
+        return reinterpret_cast<FPType>(fp)(dwUserIndex, pVibration);
+    }
+
+    return ERROR_DEVICE_NOT_CONNECTED;
+}
+
 #pragma comment(linker, "/export:XInputGetCapabilities,@4")
 extern "C" DWORD XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES *pCapabilities) {
    static auto fp = getFP("XInputGetCapabilities");
--- a/loader/src/hooks/DynamicCastFix.cpp
+++ b/loader/src/hooks/DynamicCastFix.cpp
@ -8,6 +8,10 @@ $execute {
    // this is needed because the transitions in cocos uses dynamic cast to check
    // layers, which fail on user layers due to typeinfo not matching

+    #if defined(GEODE_IS_MAC) && GEODE_COMP_GD_VERSION != 22074
+        #error "Unsupported version for macOS dynamic cast fix, please update the addresses"
+    #endif
+
    #if defined(GEODE_IS_INTEL_MAC)
        void* dynamicCastAddr = reinterpret_cast<void*>(base::get() + 0x7ba1d8);
        (void) Mod::get()->hook(dynamicCastAddr, &cast::typeinfoCastInternal, "__dynamic_cast");
--- a/loader/src/ui/mods/list/ModItem.cpp
+++ b/loader/src/ui/mods/list/ModItem.cpp
@ -330,9 +330,10 @@ void ModItem::updateState() {
    auto wantsRestart = m_source.wantsRestart();

    auto download = server::ModDownloadManager::get()->getDownload(m_source.getID());
+    bool isDownloading = download && download->isActive();

    // If there is an active download ongoing, show that in place of developer name 
-    if (download && download->isActive()) {
+    if (isDownloading) {
        m_updateBtn->setVisible(false);
        m_restartRequiredLabel->setVisible(false);
        m_developers->setVisible(false);
@ -431,7 +432,7 @@ void ModItem::updateState() {
            m_bg->setColor("mod-list-errors-found"_cc3b);
            m_bg->setOpacity(isGeodeTheme() ? 25 : 90);
        }
-        if (!wantsRestart && targetsOutdated) {
+        if (!wantsRestart && targetsOutdated && !isDownloading) {
            LoadProblem problem = targetsOutdated.value();
            m_bg->setColor("mod-list-outdated-label"_cc3b);
            m_bg->setOpacity(isGeodeTheme() ? 25 : 90);
--- a/loader/src/ui/mods/sources/ModSource.cpp
+++ b/loader/src/ui/mods/sources/ModSource.cpp
@ -5,6 +5,7 @@
 #include <Geode/ui/GeodeUI.hpp>
 #include <server/DownloadManager.hpp>
 #include <Geode/binding/GameObject.hpp>
+#include <unordered_set>

 LoadModSuggestionTask loadModSuggestion(LoadProblem const& problem) {
    // Recommended / suggested are essentially the same thing for the purposes of this
@ -183,19 +184,22 @@ server::ServerRequest<std::unordered_set<std::string>> ModSource::fetchValidTags
    return std::visit(makeVisitor {
        [](Mod* mod) {
            return server::getTags().map(
-                [mod](auto* result) -> Result<std::unordered_set<std::string>, server::ServerError> {
+                [mod](Result<std::unordered_set<std::string>, server::ServerError>* result) 
+                    -> Result<std::unordered_set<std::string>, server::ServerError> {
+                    std::unordered_set<std::string> finalTags;
+                    auto modTags = mod->getMetadata().getTags();
+
                    if (result->isOk()) {
+                        std::unordered_set<std::string> fetched = result->unwrap();
                        // Filter out invalid tags
-                        auto modTags = mod->getMetadata().getTags();
-                        auto finalTags = std::unordered_set<std::string>();
-                        for (auto& tag : modTags) {
-                            if (result->unwrap().contains(tag)) {
+                        for (std::string const& tag : modTags) {
+                            if (fetched.contains(tag)) {
                                finalTags.insert(tag);
                            }
                        }
-                        return Ok(finalTags);
                    }
-                    return Ok(result->unwrap());
+
+                    return Ok(finalTags);
                },
                [](server::ServerProgress* progress) {
                    return *progress;
Author	SHA1	Message	Date
larzie	4631fcf859	Merge `d86830028e` into `01807fedc9`	2024-11-14 00:29:58 +01:00
Fleeym	01807fedc9	fix(ModSource): fix bad unwrap in fetchValidTags Some checks are pending Build Binaries / Build Windows (push) Waiting to run Details Build Binaries / Build macOS (push) Waiting to run Details Build Binaries / Build Android (64-bit) (push) Waiting to run Details Build Binaries / Build Android (32-bit) (push) Waiting to run Details Build Binaries / Publish (push) Blocked by required conditions Details Check CHANGELOG.md / Check CHANGELOG.md (push) Waiting to run Details	2024-11-13 23:19:07 +02:00
matcool	22a11b96e2	fix wrong type in Task::chain impl	2024-11-13 16:20:50 -03:00
Fleeym	6679a690a2	fix(ModItem): hide outdated label when updating	2024-11-13 19:48:47 +02:00
mat	ebd4c920f5	add placeholder link for new hook priority system lets not forget to write docs for this..	2024-11-13 13:38:10 -03:00
dankmeme01	71f56ef49e	add XInputSetState export in proxy loader, fixing certain steam emus Some checks are pending Build Binaries / Build Windows (push) Waiting to run Details Build Binaries / Build macOS (push) Waiting to run Details Build Binaries / Build Android (64-bit) (push) Waiting to run Details Build Binaries / Build Android (32-bit) (push) Waiting to run Details Build Binaries / Publish (push) Blocked by required conditions Details Check CHANGELOG.md / Check CHANGELOG.md (push) Waiting to run Details	2024-11-13 14:59:12 +01:00
mat	1af10eea7f	add check for gd version in DynamicCastFix.cpp prevents silently breaking macos	2024-11-13 10:41:13 -03:00
mat	37fb2a3ddf	missing commit hash on changelog	2024-11-13 10:06:00 -03:00
larzie	d86830028e	My bad :p	2024-11-08 16:55:41 +03:00
larzie	179c3033ba	Update build debug info action	2024-11-08 14:19:10 +03:00
larzie	8903fa0dff	Update build debug info post action	2024-11-08 13:10:46 +03:00
larzie	ba601d8855	Update site build CI	2024-11-07 16:12:46 +03:00
larzie	23138cfc99	Update draft release action	2024-11-07 16:11:40 +03:00
larzie	9660667888	Update changelog checker	2024-11-07 16:07:12 +03:00
larzie	e4049f4b81	Update build CI	2024-11-07 16:04:39 +03:00