Compare commits

...

10 commits

Author SHA1 Message Date
larzie
31d522a089
Merge d86830028e into c0514b1915 2024-11-19 08:28:36 +01:00
mat
c0514b1915
bump to beta.2
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-19 00:37:04 -03:00
Justin
dd1d83558f
Add a button that copies the mod list (#1039)
* New image arguments format

* add ampersand support whoops

* first moves oh lord

* it's finished holy moly

* made it slightly better

* almost forgot

* texture revamp by @Alphalaneous

* why is it not loading

* whoops

* FINALLY

* targetsOutdatedVersion

* i love abi breaks

* how's this

* this thing

* this is driving me nuts
2024-11-18 18:30:58 -07: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
11 changed files with 429 additions and 285 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
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()

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
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

View file

@ -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 }}

View file

@ -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

View file

@ -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

View file

@ -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'
})

View file

@ -1,5 +1,21 @@
# Geode Changelog
## v4.0.0-beta.2
* Add grid view to mod list (7bcf50d, 1ff24f0)
* Add safe mode tip to windows crashlog window (38f3385)
* Disable enabled button on outdated mods (302eea1)
* Add a button to copy list of mods to clipboard (#1039)
* Fix VersionInfo toJson (f6c2322)
* Add `GEODE_DESKTOP(...)` and `GEODE_MOBILE(...)` macros (d6f0c59)
* Fix CCCallFuncExt (b9fb2f6)
* Fix `utils::string::replaceIP` when filter is empty (4d5e465)
* Fix more log nesting issues (2221095)
* Fix new before/after priority system (17bf772)
* Added European Portuguese translation (#1160)
* Add missing CCHttpRequest methods and members (#1161)
* Fix downloading many mods at once causing the UI to lag (c94a533)
* Fix vv version (6e86b38)
## v4.0.0-beta.1
* Button to manually install mods from files (e881dc5)
* Add `ModRequestedAction::Update` (e881dc5)

View file

@ -1 +1 @@
4.0.0-beta.1
4.0.0-beta.2

View file

@ -91,6 +91,10 @@
"name": "Expand Installed Mods List",
"description": "Make the installed mods list a single infinite scrollable list instead of having pages"
},
"copy-mods": {
"type": "custom:copy-mods",
"name": ""
},
"developer-title": {
"type": "title",
"name": "Developer Settings"

View file

@ -0,0 +1,43 @@
#include "CopyButtonSetting.hpp"
#include <Geode/loader/Mod.hpp>
$on_mod(Loaded) {
(void)Mod::get()->registerCustomSettingType("copy-mods", &CopyButtonSetting::parse);
}
SettingNodeV3* CopyButtonSetting::createNode(float width) {
return CopyButtonSettingNode::create(std::static_pointer_cast<CopyButtonSetting>(shared_from_this()), width);
}
void CopyButtonSettingNode::onCopy(CCObject*) {
auto mods = Loader::get()->getAllMods();
if (mods.empty()) {
Notification::create("No mods installed", NotificationIcon::Info, 0.5f)->show();
return;
}
std::sort(mods.begin(), mods.end(), [](Mod* a, Mod* b) {
auto const s1 = a->getID();
auto const s2 = b->getID();
return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), [](auto a, auto b) {
return std::tolower(a) < std::tolower(b);
});
});
std::string modsList;
using namespace std::string_view_literals;
for (int i = 0; i < mods.size(); i++) {
auto& mod = mods[i];
modsList += fmt::format("{} | [{}] {}{}",
mod->isEnabled() ? "x"sv :
mod->hasLoadProblems() ? "!"sv :
mod->targetsOutdatedVersion() ? "*"sv :
" "sv,
mod->getVersion().toVString(), mod->getID(),
i < mods.size() ? "\n" : ""
);
}
clipboard::write(modsList);
Notification::create("Mods list copied to clipboard", NotificationIcon::Info, 0.5f)->show();
}

View file

@ -0,0 +1,76 @@
#include <Geode/loader/SettingV3.hpp>
#include <ui/mods/GeodeStyle.hpp>
using namespace geode::prelude;
class CopyButtonSetting : public SettingV3 {
public:
static Result<std::shared_ptr<SettingV3>> parse(std::string const& key, std::string const& modID, matjson::Value const& json) {
auto res = std::make_shared<CopyButtonSetting>();
auto root = checkJson(json, "CopyButtonSetting");
res->init(key, modID, root);
res->parseNameAndDescription(root);
return root.ok(std::static_pointer_cast<SettingV3>(res));
}
bool load(matjson::Value const& json) override {
return true;
}
bool save(matjson::Value& json) const override {
return true;
}
bool isDefaultValue() const override {
return true;
}
void reset() override {}
SettingNodeV3* createNode(float width) override;
};
class CopyButtonSettingNode : public SettingNodeV3 {
protected:
bool init(std::shared_ptr<CopyButtonSetting> setting, float width) {
if (!SettingNodeV3::init(setting, width))
return false;
auto buttonSprite = createGeodeButton("Copy Mods");
buttonSprite->setScale(.5f);
auto button = CCMenuItemSpriteExtra::create(
buttonSprite, this, menu_selector(CopyButtonSettingNode::onCopy)
);
this->getButtonMenu()->addChildAtPosition(button, Anchor::Center);
this->getButtonMenu()->setPosition(getContentSize() / 2);
this->getButtonMenu()->setAnchorPoint({ .5f, .5f });
this->getButtonMenu()->updateLayout();
this->updateState(nullptr);
return true;
}
void onCopy(CCObject*);
void onCommit() override {}
void onResetToDefault() override {}
public:
static CopyButtonSettingNode* create(std::shared_ptr<CopyButtonSetting> setting, float width) {
auto ret = new CopyButtonSettingNode();
if (ret && ret->init(setting, width)) {
ret->autorelease();
return ret;
}
CC_SAFE_DELETE(ret);
return nullptr;
}
bool hasUncommittedChanges() const override {
return false;
}
bool hasNonDefaultValue() const override {
return false;
}
};