forked from flyinghead/flycast
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #266 from inada-s/merge-upstream-20250101
Merge upstream 20250101
- Loading branch information
Showing
1,640 changed files
with
217,170 additions
and
154,609 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| buy_me_a_coffee: hhwtpernwq | ||
| custom: ['https://www.paypal.com/paypalme/FlycastEmu'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ assignees: '' | |
|
|
||
| Platform / OS / Hardware: | ||
|
|
||
| Github hash: | ||
| Flycast version: | ||
|
|
||
| Hardware: | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ on: [public] | |
|
|
||
| jobs: | ||
| build: | ||
| name: Android | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
|
|
@@ -12,30 +13,41 @@ jobs: | |
| sudo apt-get update | ||
| sudo apt-get -y install ccache libcurl4-openssl-dev ninja-build | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| submodules: true | ||
| - uses: actions/setup-java@v3 | ||
| submodules: recursive | ||
|
|
||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: '17' | ||
| distribution: 'temurin' | ||
| cache: 'gradle' | ||
|
|
||
| - uses: actions/cache@v3 | ||
| - uses: actions/cache@v4 | ||
| with: | ||
| path: ~/.ccache | ||
| key: android-ccache-${{ github.sha }} | ||
| restore-keys: android-ccache- | ||
|
|
||
| - name: Disable release signing | ||
| run: sed -i 's/signingConfig signingConfigs.release/signingConfig signingConfigs.debug/g' shell/android-studio/flycast/build.gradle | ||
| if: github.repository != 'flyinghead/flycast' || github.event_name != 'push' | ||
|
|
||
| - name: Bump version code | ||
| uses: chkfung/[email protected] | ||
| with: | ||
| gradlePath: shell/android-studio/flycast/build.gradle | ||
| versionCode: ${{ github.run_number }} | ||
|
|
||
| - name: Gradle | ||
| working-directory: shell/android-studio | ||
| run: ./gradlew assembleRelease --parallel | ||
| run: ./gradlew assembleRelease bundleRelease --parallel | ||
| env: | ||
| SENTRY_UPLOAD_URL: ${{ secrets.SENTRY_UPLOAD_URL }} | ||
| ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} | ||
|
|
||
| - uses: actions/upload-artifact@v3 | ||
| - uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: flycast-release.apk | ||
| path: shell/android-studio/flycast/build/outputs/apk/release/flycast-release.apk | ||
|
|
@@ -50,7 +62,7 @@ jobs: | |
| - name: Extract symbols | ||
| run: | | ||
| DUMP_SYMS=./core/deps/breakpad/bin/dump_syms | ||
| SO_DIR=shell/android-studio/flycast/build/intermediates/merged_native_libs/release/out/lib | ||
| SO_DIR=shell/android-studio/flycast/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib | ||
| for arch in arm64-v8a armeabi-v7a x86 x86_64 ; do | ||
| $DUMP_SYMS $SO_DIR/$arch/libflycast.so > libflycast.so.sym | ||
| BUILD_ID=`head -1 libflycast.so.sym | awk '{ print $4 }'` | ||
|
|
@@ -60,34 +72,37 @@ jobs: | |
| - name: Configure AWS Credentials | ||
| id: aws-credentials | ||
| uses: aws-actions/configure-aws-credentials@v2 | ||
| uses: aws-actions/configure-aws-credentials@v4 | ||
| with: | ||
| aws-access-key-id: AKIAJOZQS4H2PHQWYFCA | ||
| aws-secret-access-key: ${{ secrets.S3_SECRET_KEY }} | ||
| aws-region: us-east-2 | ||
| if: github.repository == 'flyinghead/flycast' && github.event_name == 'push' | ||
|
|
||
| - name: Upload to S3 | ||
| run: aws s3 sync shell/android-studio/flycast/build/outputs/apk/release s3://flycast-builds/android/${GITHUB_REF#refs/}-$GITHUB_SHA --acl public-read --exclude='*.json' --follow-symlinks | ||
| run: | | ||
| cp shell/android-studio/flycast/build/outputs/bundle/release/*.aab shell/android-studio/flycast/build/outputs/apk/release/ | ||
| aws s3 sync shell/android-studio/flycast/build/outputs/apk/release s3://flycast-builds/android/${GITHUB_REF#refs/}-$GITHUB_SHA --acl public-read --exclude='*.json' --follow-symlinks | ||
| if: ${{ steps.aws-credentials.outputs.aws-account-id != '' }} | ||
|
|
||
| - name: Setup Sentry CLI | ||
| uses: mathieu-bour/setup-sentry-cli@v1 | ||
| uses: mathieu-bour/setup-sentry-cli@v2 | ||
| env: | ||
| SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }} | ||
| with: | ||
| url: https://sentry.io | ||
| token: ${{ env.SENTRY_TOKEN }} | ||
| organization: flycast | ||
| project: minidump | ||
| version: 2.21.2 | ||
| if: ${{ env.SENTRY_TOKEN != '' }} | ||
|
|
||
| - name: Upload symbols to Sentry | ||
| run: | | ||
| VERSION=$(git describe --tags --always) | ||
| sentry-cli releases new "$VERSION" | ||
| sentry-cli releases set-commits "$VERSION" --auto | ||
| sentry-cli upload-dif symbols | ||
| sentry-cli debug-files upload symbols | ||
| shell: bash | ||
| env: | ||
| SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| name: BSD CI | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| build: | ||
| env: | ||
| CCACHE_DIR: ${{ github.workspace }}/.ccache | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| operating_system: [ freebsd, netbsd, openbsd ] | ||
| architecture: [ arm64, x86-64 ] | ||
| include: | ||
| - operating_system: freebsd | ||
| version: '14.2' | ||
| pkginstall: sudo pkg install -y alsa-lib ccache cmake evdev-proto git libao libevdev libudev-devd libzip lua54 miniupnpc ninja pkgconf pulseaudio sdl2 libcdio | ||
| - operating_system: netbsd | ||
| version: '10.0' | ||
| pkginstall: sudo pkgin update && sudo pkgin -y install alsa-lib ccache cmake gcc12 git libao libzip lua54 miniupnpc ninja-build pkgconf pulseaudio SDL2 libcdio && export PATH=/usr/pkg/gcc12/bin:$PATH | ||
| - operating_system: openbsd | ||
| version: '7.6' | ||
| pkginstall: sudo pkg_add ccache cmake git libao libzip miniupnpc ninja pkgconf pulseaudio sdl2 libcdio | ||
| exclude: | ||
| - architecture: arm64 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| submodules: true | ||
|
|
||
| - uses: actions/cache@v4 | ||
| with: | ||
| path: ${{ env.CCACHE_DIR }} | ||
| key: ccache-${{ matrix.operating_system }}-${{ matrix.architecture }}-${{ github.sha }} | ||
| restore-keys: ccache-${{ matrix.operating_system }}-${{ matrix.architecture }}- | ||
|
|
||
| - uses: cross-platform-actions/[email protected] | ||
| with: | ||
| operating_system: ${{ matrix.operating_system }} | ||
| architecture: ${{ matrix.architecture }} | ||
| version: ${{ matrix.version }} | ||
| environment_variables: CCACHE_DIR | ||
| run: | | ||
| ${{ matrix.pkginstall }} | ||
| cmake -B build -DUSE_LIBCDIO=ON -DCMAKE_BUILD_TYPE=Release -G Ninja | ||
| cmake --build build --config Release |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.