Compare commits

...

15 commits

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
Build Binaries / Build macOS (push) Waiting to run
Build Binaries / Build Android (64-bit) (push) Waiting to run
Build Binaries / Build Android (32-bit) (push) Waiting to run
Build Binaries / Publish (push) Blocked by required conditions
Check CHANGELOG.md / Check CHANGELOG.md (push) Waiting to run
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
Build Binaries / Build macOS (push) Waiting to run
Build Binaries / Build Android (64-bit) (push) Waiting to run
Build Binaries / Build Android (32-bit) (push) Waiting to run
Build Binaries / Publish (push) Blocked by required conditions
Check CHANGELOG.md / Check CHANGELOG.md (push) Waiting to run
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
12 changed files with 322 additions and 297 deletions

View file

@ -1,4 +1,4 @@
name: Prepare for Build Debug Info name: Prepare for Build Debug Info
description: Provides debug info for the build process description: Provides debug info for the build process
inputs: inputs:
@ -9,25 +9,33 @@ inputs:
runs: runs:
using: "composite" using: "composite"
steps: steps:
- name: Preprocess - name: Preprocess
shell: bash shell: bash
run: | run: |
mkdir build-debug-info-preprocessed mkdir build-debug-info-preprocessed
cd build cd build
sed 's/\\\\/\//g' compile_commands.json | sed 's/D:\//\/d\//' > uni_compile_commands.json sed 's/\\\\/\//g' compile_commands.json | sed 's/D:\//\/d\//' > uni_compile_commands.json
pip install compile-commands --break-system-packages 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 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 - name: Upload Build Debug Info
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: geode-build-debug-info-${{ inputs.target }} name: geode-build-debug-info-${{ inputs.target }}
path: ./build-debug-info/* path: ./build-debug-info/*
if: success() || failure() if: success() || failure()
- name: Upload Preprocessed Files - name: Upload Preprocessed Files
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: geode-build-debug-info-preprocessed-${{ inputs.target }} name: geode-build-debug-info-preprocessed-${{ inputs.target }}
path: ./build-debug-info-preprocessed/* path: ./build-debug-info-preprocessed/*
if: success() || failure() if: success() || failure()

View file

@ -1,16 +1,18 @@
name: Prepare for Build Debug Info name: Prepare for Build Debug Info
description: Provides debug info for the build process description: Provides debug info for the build process
inputs: inputs:
has-sccache: has-sccache:
description: 'Whether the build action has sccache' description: 'Whether the build action has sccache'
required: true required: true
outputs: outputs:
extra-configure: extra-configure:
description: 'Extra stuff for CMake configure step' description: 'Extra stuff for CMake configure step'
value: | value: |
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
cp ./build/compile_commands.json ./build-debug-info/ cp ./build/compile_commands.json ./build-debug-info/
extra-build: extra-build:
description: 'Extra stuff for CMake build step' description: 'Extra stuff for CMake build step'
value: | value: |
@ -20,17 +22,17 @@ outputs:
runs: runs:
using: "composite" using: "composite"
steps: steps:
- name: Prepare - name: Prepare
shell: bash shell: bash
run: | run: |
mkdir ./build-debug-info mkdir ./build-debug-info
echo "SCCACHE_ERROR_LOG=$GITHUB_WORKSPACE/build-debug-info/sccache-log.txt" >> $GITHUB_ENV echo "SCCACHE_ERROR_LOG=$GITHUB_WORKSPACE/build-debug-info/sccache-log.txt" >> $GITHUB_ENV
echo "SCCACHE_LOG=debug" >> $GITHUB_ENV echo "SCCACHE_LOG=debug" >> $GITHUB_ENV
echo "RUST_BACKTRACE=1" >> $GITHUB_ENV echo "RUST_BACKTRACE=1" >> $GITHUB_ENV
- name: Checkout ninjatracing - name: Checkout ninjatracing repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: 'nico/ninjatracing' repository: 'nico/ninjatracing'
path: ninjatracing path: ninjatracing
submodules: recursive submodules: recursive

View file

@ -16,8 +16,8 @@ on:
pull_request: pull_request:
push: push:
branches: branches:
- '**' # every branch - '**' # every branch
- '!no-build-**' # unless marked as no-build - '!no-build-**' # unless marked as no-build
env: env:
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
@ -36,103 +36,101 @@ jobs:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
- name: Checkout - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- name: Prepare for Build Debug Info - name: Prepare for Build Debug Info
id: build-debug-info id: build-debug-info
uses: ./.github/actions/build-debug-info uses: ./.github/actions/build-debug-info
with: with:
has-sccache: ${{ inputs.use-ccache }} has-sccache: ${{ inputs.use-ccache }}
if: inputs.build-debug-info if: inputs.build-debug-info
- name: Setup caches - name: Setup caches
uses: ./.github/actions/setup-cache uses: ./.github/actions/setup-cache
with: with:
host: linux host: linux
target: win target: win
use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}
- name: Setup Ninja - name: Setup Ninja
uses: ./.github/actions/setup-ninja uses: ./.github/actions/setup-ninja
with: with:
host: linux host: linux
- name: Setup CLI - name: Setup CLI
uses: geode-sdk/cli/.github/actions/setup@main uses: geode-sdk/cli/.github/actions/setup@main
- name: Download xwin - name: Download xwin
uses: robinraju/release-downloader@v1.10 uses: robinraju/release-downloader@v1
with: with:
repository: Jake-Shadle/xwin repository: Jake-Shadle/xwin
latest: true latest: true
fileName: 'xwin-*-x86_64-unknown-linux-musl.tar.gz' fileName: 'xwin-*-x86_64-unknown-linux-musl.tar.gz'
tarBall: false tarBall: false
zipBall: false zipBall: false
out-file-path: "epic-xwin" out-file-path: "epic-xwin"
- name: Prepare xwin - name: Prepare xwin
run: | run: |
tar -xzf epic-xwin/xwin-*-x86_64-unknown-linux-musl.tar.gz -C epic-xwin 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 mv epic-xwin/xwin-*-x86_64-unknown-linux-musl/xwin ./xwin
./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license list ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license list
# this caches '.xwin-cache/**/*' but that's actually only gonna - name: Setup xwin Cache
# contain the manifest cuz we only ran `xwin list` so far id: xwin-cache
- name: Setup xwin Cache uses: actions/cache@v4
id: xwin-cache with:
uses: actions/cache@v4 path: .xwin-cache
with: key: xwin-win-v1-${{ hashFiles('.xwin-cache/**/*') }}
path: .xwin-cache
key: xwin-win-v1-${{ hashFiles('.xwin-cache/**/*') }}
- name: Download Windows headers - name: Download Windows headers
run: ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license splat --include-debug-libs run: ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license splat --include-debug-libs
if: steps.xwin-cache.outputs.cache-hit != 'true' if: steps.xwin-cache.outputs.cache-hit != 'true'
- name: Download clang-msvc-sdk toolchain - name: Download clang-msvc-sdk toolchain
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: 'geode-sdk/clang-msvc-sdk' repository: 'geode-sdk/clang-msvc-sdk'
path: toolchain path: toolchain
submodules: recursive submodules: recursive
- name: Configure - name: Configure
run: ${{ env.base-configure-command }} -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN ${{ steps.build-debug-info.outputs.extra-configure }} run: ${{ env.base-configure-command }} -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN ${{ steps.build-debug-info.outputs.extra-configure }}
env: env:
SPLAT_DIR: ${{ github.workspace }}/.xwin-cache/splat SPLAT_DIR: ${{ github.workspace }}/.xwin-cache/splat
TOOLCHAIN: ${{ github.workspace }}/toolchain/clang-msvc.cmake TOOLCHAIN: ${{ github.workspace }}/toolchain/clang-msvc.cmake
HOST_ARCH: x86_64 HOST_ARCH: x86_64
- name: Build - name: Build
run: | run: |
${{ env.base-build-command }} ${{ env.base-build-command }}
${{ steps.build-debug-info.outputs.extra-build }} ${{ steps.build-debug-info.outputs.extra-build }}
- name: Upload Artifacts - name: Upload artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: geode-win name: geode-win
path: ./bin/nightly path: ./bin/nightly
- name: Package Installer - name: Package installer
run: | run: |
sudo apt install nsis sudo apt install nsis
makensis -WX -V3 ./installer/windows/installer.nsi makensis -WX -V3 ./installer/windows/installer.nsi
- name: Upload Installer - name: Upload installer
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: geode-installer-win name: geode-installer-win
path: './installer/windows/geode-installer-win.exe' path: './installer/windows/geode-installer-win.exe'
- name: Complete Build Debug Info - name: Complete Build Debug Info
uses: ./.github/actions/build-debug-info-post uses: ./.github/actions/build-debug-info-post
with: with:
target: win target: win
if: inputs.build-debug-info && (success() || failure()) if: inputs.build-debug-info && (success() || failure())
build-mac: build-mac:
name: Build macOS name: Build macOS
@ -142,213 +140,211 @@ jobs:
SCCACHE_CACHE_MULTIARCH: 1 SCCACHE_CACHE_MULTIARCH: 1
steps: steps:
- name: Checkout - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- name: Prepare for Build Debug Info - name: Prepare for Build Debug Info
id: build-debug-info id: build-debug-info
uses: ./.github/actions/build-debug-info uses: ./.github/actions/build-debug-info
with: with:
has-sccache: ${{ inputs.use-ccache }} has-sccache: ${{ inputs.use-ccache }}
if: inputs.build-debug-info 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 - name: Setup Ninja
# uses: ./.github/actions/setup-cache uses: ./.github/actions/setup-ninja
# with: with:
# host: mac host: mac
# target: mac
# use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}
- name: Setup Ninja - name: Setup CLI
uses: ./.github/actions/setup-ninja uses: geode-sdk/cli/.github/actions/setup@main
with:
host: mac
- name: Setup CLI - name: Configure
uses: geode-sdk/cli/.github/actions/setup@main 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 - name: Build
run: > run: |
${{ env.base-configure-command }} ${{ env.base-build-command }}
-DCMAKE_C_COMPILER=clang ${{ steps.build-debug-info.outputs.extra-build }}
-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 - name: Upload artifacts
run: | uses: actions/upload-artifact@v4
${{ env.base-build-command }} with:
${{ steps.build-debug-info.outputs.extra-build }} name: geode-mac
path: ./bin/nightly
- name: Upload Artifacts - name: Package installer
uses: actions/upload-artifact@v4 run: ./installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg
with:
name: geode-mac
path: ./bin/nightly
- name: Package Installer - name: Upload installer
run: ./installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg uses: actions/upload-artifact@v4
with:
name: geode-installer-mac
path: './installer/mac/geode-installer-mac.pkg'
- name: Upload Installer - name: Complete Build Debug Info
uses: actions/upload-artifact@v4 uses: ./.github/actions/build-debug-info-post
with: with:
name: geode-installer-mac target: mac
path: './installer/mac/geode-installer-mac.pkg' 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: build-android:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
config: config:
- name: Android (32-bit) - name: Android (32-bit)
id: android32 id: android32
extra-configure: -DANDROID_ABI=armeabi-v7a extra-configure: -DANDROID_ABI=armeabi-v7a
- name: Android (64-bit)
- name: Android (64-bit) id: android64
id: android64 extra-configure: -DANDROID_ABI=arm64-v8a
extra-configure: -DANDROID_ABI=arm64-v8a
name: Build ${{ matrix.config.name }} name: Build ${{ matrix.config.name }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- name: Prepare for Build Debug Info - name: Prepare for Build Debug Info
id: build-debug-info id: build-debug-info
uses: ./.github/actions/build-debug-info uses: ./.github/actions/build-debug-info
with: with:
has-sccache: ${{ inputs.use-ccache }} has-sccache: ${{ inputs.use-ccache }}
if: inputs.build-debug-info if: inputs.build-debug-info
- name: Setup caches - name: Setup caches
uses: ./.github/actions/setup-cache uses: ./.github/actions/setup-cache
with: with:
host: linux host: linux
target: ${{ matrix.config.id }} target: ${{ matrix.config.id }}
use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}
- name: Setup Ninja - name: Setup Ninja
uses: ./.github/actions/setup-ninja uses: ./.github/actions/setup-ninja
with: with:
host: linux host: linux
- name: Setup CLI - name: Setup CLI
uses: geode-sdk/cli/.github/actions/setup@main uses: geode-sdk/cli/.github/actions/setup@main
- name: Setup Breakpad Tools - name: Setup Breakpad Tools
uses: ./.github/actions/setup-dump-sym uses: ./.github/actions/setup-dump-sym
id: breakpad-tools id: breakpad-tools
- name: Fix Ubuntu libcstd++ - name: Fix Ubuntu libcstd++
run: | run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update sudo apt-get update
sudo apt-get install --only-upgrade libstdc++6 sudo apt-get install --only-upgrade libstdc++6
- name: Configure - name: Configure
run: > run: >
${{ env.base-configure-command }} ${{ env.base-configure-command }}
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake
-DCMAKE_C_COMPILER=clang -DCMAKE_C_COMPILER=clang
-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_COMPILER=clang++
-DANDROID_PLATFORM=android-23 -DANDROID_PLATFORM=android-23
-DANDROID_STL=c++_shared -DANDROID_STL=c++_shared
${{ matrix.config.extra-configure }} ${{ matrix.config.extra-configure }}
${{ steps.build-debug-info.outputs.extra-configure }} ${{ steps.build-debug-info.outputs.extra-configure }}
- name: Build - name: Build
run: | run: |
${{ env.base-build-command }} ${{ env.base-build-command }}
${{ steps.build-debug-info.outputs.extra-build }} ${{ steps.build-debug-info.outputs.extra-build }}
# hardcoding toolchain path :( - name: Dump symbols
- name: Dump Symbols run: |
run: | ${{ steps.breakpad-tools.outputs.binary-path }} ./bin/nightly/Geode.${{ matrix.config.id }}.so -o ./bin/nightly/Geode.${{ matrix.config.id }}.so.sym
${{ 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
$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip ./bin/nightly/Geode.${{ matrix.config.id }}.so
- name: Upload Artifacts - name: Upload artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: geode-${{ matrix.config.id }} name: geode-${{ matrix.config.id }}
path: ./bin/nightly path: ./bin/nightly
- name: Complete Build Debug Info - name: Complete Build Debug Info
uses: ./.github/actions/build-debug-info-post uses: ./.github/actions/build-debug-info-post
with: with:
target: ${{ matrix.config.id }} target: ${{ matrix.config.id }}
if: inputs.build-debug-info && (success() || failure()) if: inputs.build-debug-info && (success() || failure())
publish: publish:
name: Publish name: Publish
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [ build-windows, build-mac, build-android ] needs: [ build-windows, build-mac, build-android ]
if: github.ref == 'refs/heads/main' if: github.ref == 'refs/heads/main'
steps: steps:
- name: Checkout - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Declare Version Variables - name: Declare version variables
id: ref id: ref
run: | run: |
echo "version=$(cat VERSION | xargs)" >> $GITHUB_OUTPUT echo "version=$(cat VERSION | xargs)" >> $GITHUB_OUTPUT
echo "hash=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT echo "hash=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT
- name: Download Artifacts - name: Download artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
- name: Move Installers - name: Move installers
run: | run: |
mv geode-installer-mac/geode-installer-mac.pkg geode-installer-${{ steps.ref.outputs.hash }}-mac.pkg 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 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 uses: vimtor/action-zip@v1.2
with: with:
files: geode-mac/Geode.dylib geode-mac/GeodeBootstrapper.dylib files: geode-mac/Geode.dylib geode-mac/GeodeBootstrapper.dylib
dest: geode-${{ steps.ref.outputs.hash }}-mac.zip dest: geode-${{ steps.ref.outputs.hash }}-mac.zip
- name: Zip Windows Artifacts - name: Zip Windows artifacts
uses: vimtor/action-zip@v1.2 uses: vimtor/action-zip@v1.2
with: with:
files: geode-win/XInput1_4.dll geode-win/Geode.dll geode-win/GeodeUpdater.exe geode-win/Geode.lib geode-win/Geode.pdb 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 dest: geode-${{ steps.ref.outputs.hash }}-win.zip
- name: Zip Android32 Artifacts - name: Zip Android32 artifacts
uses: vimtor/action-zip@v1.2 uses: vimtor/action-zip@v1.2
with: with:
files: geode-android32/Geode.android32.so geode-android32/Geode.android32.so.sym files: geode-android32/Geode.android32.so geode-android32/Geode.android32.so.sym
dest: geode-${{ steps.ref.outputs.hash }}-android32.zip dest: geode-${{ steps.ref.outputs.hash }}-android32.zip
- name: Zip Android64 Artifacts - name: Zip Android64 artifacts
uses: vimtor/action-zip@v1.2 uses: vimtor/action-zip@v1.2
with: with:
files: geode-android64/Geode.android64.so geode-android64/Geode.android64.so.sym files: geode-android64/Geode.android64.so geode-android64/Geode.android64.so.sym
dest: geode-${{ steps.ref.outputs.hash }}-android64.zip dest: geode-${{ steps.ref.outputs.hash }}-android64.zip
- name: Zip Resources - name: Zip resources
uses: vimtor/action-zip@v1.2 uses: vimtor/action-zip@v1.2
with: with:
files: geode-android64/resources files: geode-android64/resources
dest: resources.zip dest: resources.zip
- name: Update Development Release - name: Update development release
uses: andelf/nightly-release@main uses: andelf/nightly-release@main
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View file

@ -1,5 +1,4 @@
# check the changelog for non ascii characters name: Check Changelog
name: Check CHANGELOG.md
on: on:
push: push:
@ -11,16 +10,19 @@ on:
jobs: jobs:
check: check:
name: Check CHANGELOG.md name: Check Changelog
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- run: | - name: Check for non-ASCII characters in changelog
if grep -q -P -n "[\x80-\xFF]" CHANGELOG.md run: |
then if grep -q -P -n "[\x80-\xFF]" CHANGELOG.md; then
exit 1; echo "Non-ASCII characters found in CHANGELOG.md"
exit 1
else
echo "No non-ASCII characters found in CHANGELOG.md"
fi fi

View file

@ -7,9 +7,10 @@ jobs:
draft: draft:
name: Draft Release name: Draft Release
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Download Development Release - name: Download development release
uses: robinraju/release-downloader@v1.9 uses: robinraju/release-downloader@v1
with: with:
tag: nightly tag: nightly
fileName: '*' fileName: '*'
@ -17,14 +18,14 @@ jobs:
zipBall: true zipBall: true
out-file-path: 'dev' out-file-path: 'dev'
- name: Declare Version Variable - name: Declare version variable
id: ref id: ref
shell: bash shell: bash
run: | run: |
VERSION=$(unzip -p ${{ github.workspace }}/dev/geode-nightly.zip geode-sdk-geode-*/VERSION | xargs) VERSION=$(unzip -p ${{ github.workspace }}/dev/geode-nightly.zip geode-sdk-geode-*/VERSION | xargs)
echo "version=$VERSION" >> $GITHUB_OUTPUT echo "version=$VERSION" >> $GITHUB_OUTPUT
# test if release already exists # Test if release already exists
set +e set +e
curl --fail "https://api.github.com/repos/geode-sdk/geode/releases/tags/v$VERSION" --silent --output /dev/null curl --fail "https://api.github.com/repos/geode-sdk/geode/releases/tags/v$VERSION" --silent --output /dev/null
RESULT=$? RESULT=$?
@ -35,7 +36,7 @@ jobs:
exit 1 exit 1
fi fi
- name: Move Files - name: Move files
run: | run: |
mv dev/geode-installer-*-win.exe geode-installer-v${{ steps.ref.outputs.version }}-win.exe 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 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/geode-*-android64.zip geode-v${{ steps.ref.outputs.version }}-android64.zip
mv dev/resources.zip resources.zip mv dev/resources.zip resources.zip
- name: Create Draft Release - name: Create draft release
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v2
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
@ -54,9 +55,9 @@ jobs:
name: Geode v${{ steps.ref.outputs.version }} name: Geode v${{ steps.ref.outputs.version }}
body: | body: |
TODO before publishing: TODO before publishing:
- mark if pre-release - Mark if pre-release
- add changelog - Add changelog
- remove this - Remove this
draft: true draft: true
files: | files: |
./geode-installer-v${{ steps.ref.outputs.version }}-win.exe ./geode-installer-v${{ steps.ref.outputs.version }}-win.exe

View file

@ -1,26 +1,22 @@
# Update the install page on the geode-sdk/website repository
name: Update Website name: Update Website
on: on:
# # trigger when a new release is released
# release:
# types:
# - released
workflow_dispatch: workflow_dispatch:
jobs: jobs:
trigger: trigger:
name: Trigger site build name: Trigger site build
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/github-script@v7 - name: Trigger build workflow on geode-sdk/website repository
with: uses: actions/github-script@v7
github-token: ${{ secrets.GEODE_BOT_PUSH_BIN_TOKEN }} with:
script: | github-token: ${{ secrets.GEODE_BOT_PUSH_BIN_TOKEN }}
await github.rest.actions.createWorkflowDispatch({ script: |
owner: 'geode-sdk', await github.rest.actions.createWorkflowDispatch({
repo: 'website', owner: 'geode-sdk',
workflow_id: 'build.yml', repo: 'website',
ref: 'main' workflow_id: 'build.yml',
}) ref: 'main'
})

View file

@ -10,10 +10,9 @@
* Rewritten matjson library * Rewritten matjson library
* Settings V2 completely removed, use V3 now * Settings V2 completely removed, use V3 now
* `JsonChecker` removed * `JsonChecker` removed
* Add new system for ordered hook priority (673317d, 6db3084) * Add new system for ordered hook priority, [see docs](https://docs.geode-sdk.org/tutorials/hookpriority) (673317d, 6db3084)
* See docs: LINK HERE!!
* C++20 coroutine support for `geode::Task`, [see docs](https://docs.geode-sdk.org/tutorials/tasks#coroutines) (e61b2c0, ab196b9) * 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) * Single page local mods list (efb1fbf)
* Split mod problems into load and outdated (12e8bbb, 09fa872, df2528c) * 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 * This means mods made for outdated gd or geode versions no longer count as actual errors, resulting in less clutter in the ui

View file

@ -817,7 +817,7 @@ namespace geode {
// make the second event listener that waits for the mapper's task // make the second event listener that waits for the mapper's task
// and just forwards everything through // and just forwards everything through
static_cast<void*>(new EventListener<NewTask>( static_cast<void*>(new EventListener<NewTask>(
[handle](Event* event) mutable { [handle](typename NewTask::Event* event) mutable {
if (auto v = event->getValue()) { if (auto v = event->getValue()) {
NewTask::finish(handle.lock(), std::move(*v)); NewTask::finish(handle.lock(), std::move(*v));
} }

View file

@ -6,6 +6,7 @@
struct XINPUT_STATE; struct XINPUT_STATE;
struct XINPUT_CAPABILITIES; struct XINPUT_CAPABILITIES;
struct XINPUT_VIBRATION;
constexpr static auto MAX_PATH_CHARS = 32768u; 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; 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") #pragma comment(linker, "/export:XInputGetCapabilities,@4")
extern "C" DWORD XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES *pCapabilities) { extern "C" DWORD XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES *pCapabilities) {
static auto fp = getFP("XInputGetCapabilities"); static auto fp = getFP("XInputGetCapabilities");

View file

@ -8,6 +8,10 @@ $execute {
// this is needed because the transitions in cocos uses dynamic cast to check // this is needed because the transitions in cocos uses dynamic cast to check
// layers, which fail on user layers due to typeinfo not matching // 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) #if defined(GEODE_IS_INTEL_MAC)
void* dynamicCastAddr = reinterpret_cast<void*>(base::get() + 0x7ba1d8); void* dynamicCastAddr = reinterpret_cast<void*>(base::get() + 0x7ba1d8);
(void) Mod::get()->hook(dynamicCastAddr, &cast::typeinfoCastInternal, "__dynamic_cast"); (void) Mod::get()->hook(dynamicCastAddr, &cast::typeinfoCastInternal, "__dynamic_cast");

View file

@ -330,9 +330,10 @@ void ModItem::updateState() {
auto wantsRestart = m_source.wantsRestart(); auto wantsRestart = m_source.wantsRestart();
auto download = server::ModDownloadManager::get()->getDownload(m_source.getID()); 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 there is an active download ongoing, show that in place of developer name
if (download && download->isActive()) { if (isDownloading) {
m_updateBtn->setVisible(false); m_updateBtn->setVisible(false);
m_restartRequiredLabel->setVisible(false); m_restartRequiredLabel->setVisible(false);
m_developers->setVisible(false); m_developers->setVisible(false);
@ -431,7 +432,7 @@ void ModItem::updateState() {
m_bg->setColor("mod-list-errors-found"_cc3b); m_bg->setColor("mod-list-errors-found"_cc3b);
m_bg->setOpacity(isGeodeTheme() ? 25 : 90); m_bg->setOpacity(isGeodeTheme() ? 25 : 90);
} }
if (!wantsRestart && targetsOutdated) { if (!wantsRestart && targetsOutdated && !isDownloading) {
LoadProblem problem = targetsOutdated.value(); LoadProblem problem = targetsOutdated.value();
m_bg->setColor("mod-list-outdated-label"_cc3b); m_bg->setColor("mod-list-outdated-label"_cc3b);
m_bg->setOpacity(isGeodeTheme() ? 25 : 90); m_bg->setOpacity(isGeodeTheme() ? 25 : 90);

View file

@ -5,6 +5,7 @@
#include <Geode/ui/GeodeUI.hpp> #include <Geode/ui/GeodeUI.hpp>
#include <server/DownloadManager.hpp> #include <server/DownloadManager.hpp>
#include <Geode/binding/GameObject.hpp> #include <Geode/binding/GameObject.hpp>
#include <unordered_set>
LoadModSuggestionTask loadModSuggestion(LoadProblem const& problem) { LoadModSuggestionTask loadModSuggestion(LoadProblem const& problem) {
// Recommended / suggested are essentially the same thing for the purposes of this // 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 { return std::visit(makeVisitor {
[](Mod* mod) { [](Mod* mod) {
return server::getTags().map( 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()) { if (result->isOk()) {
std::unordered_set<std::string> fetched = result->unwrap();
// Filter out invalid tags // Filter out invalid tags
auto modTags = mod->getMetadata().getTags(); for (std::string const& tag : modTags) {
auto finalTags = std::unordered_set<std::string>(); if (fetched.contains(tag)) {
for (auto& tag : modTags) {
if (result->unwrap().contains(tag)) {
finalTags.insert(tag); finalTags.insert(tag);
} }
} }
return Ok(finalTags);
} }
return Ok(result->unwrap());
return Ok(finalTags);
}, },
[](server::ServerProgress* progress) { [](server::ServerProgress* progress) {
return *progress; return *progress;