diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 4fd28d46..00000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -# These is the list of funding model platforms used by Skyline - -patreon: skyline_emu diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f67656d6..9f977734 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest env: JVM_OPTS: -Xmx6G - IS_SKYLINE_SIGNED: ${{ secrets.KEYSTORE != '' }} + IS_BUILD_SIGNED: ${{ secrets.KEYSTORE != '' }} UPLOAD_ARTIFACTS: ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'ci') }} CMAKE_VERSION: "3.22.1" NDK_VERSION: "25.0.8775105" @@ -50,7 +50,7 @@ jobs: run: echo "yes" | $ANDROID_HOME/tools/bin/sdkmanager "cmake;${{ env.CMAKE_VERSION }}" "ndk;${{ env.NDK_VERSION }}" --channel=3 | grep -v = || true - name: Decode Keystore - if: env.IS_SKYLINE_SIGNED == 'true' + if: env.IS_BUILD_SIGNED == 'true' env: KEYSTORE_ENCODED: ${{ secrets.KEYSTORE }} run: echo $KEYSTORE_ENCODED | base64 --decode > "/home/runner/keystore.jks" @@ -67,41 +67,41 @@ jobs: run: ./gradlew --stacktrace --configuration-cache --build-cache --parallel --configure-on-demand assembleFullRelease assembleFullReldebug - name: Rename APKs (Signed) - if: env.IS_SKYLINE_SIGNED == 'true' && env.UPLOAD_ARTIFACTS == 'true' + if: env.IS_BUILD_SIGNED == 'true' && env.UPLOAD_ARTIFACTS == 'true' run: | - mv app/build/outputs/apk/full/reldebug/app-full-reldebug.apk skyline-$GITHUB_RUN_NUMBER-reldebug.apk - mv app/build/outputs/apk/full/release/app-full-release.apk skyline-$GITHUB_RUN_NUMBER-release.apk + mv app/build/outputs/apk/full/reldebug/app-full-reldebug.apk strato-$GITHUB_RUN_NUMBER-reldebug.apk + mv app/build/outputs/apk/full/release/app-full-release.apk strato-$GITHUB_RUN_NUMBER-release.apk - name: Upload Signed Debug APK - if: env.IS_SKYLINE_SIGNED == 'true' && env.UPLOAD_ARTIFACTS == 'true' + if: env.IS_BUILD_SIGNED == 'true' && env.UPLOAD_ARTIFACTS == 'true' uses: actions/upload-artifact@v3 with: - name: skyline-${{ github.run_number }}-reldebug.apk - path: skyline-${{ github.run_number }}-reldebug.apk + name: strato-${{ github.run_number }}-reldebug.apk + path: strato-${{ github.run_number }}-reldebug.apk - name: Upload Signed Release APK - if: env.IS_SKYLINE_SIGNED == 'true' && env.UPLOAD_ARTIFACTS == 'true' + if: env.IS_BUILD_SIGNED == 'true' && env.UPLOAD_ARTIFACTS == 'true' uses: actions/upload-artifact@v3 with: - name: skyline-${{ github.run_number }}-release.apk - path: skyline-${{ github.run_number }}-release.apk + name: strato-${{ github.run_number }}-release.apk + path: strato-${{ github.run_number }}-release.apk - name: Rename APKs (Unsigned) - if: env.IS_SKYLINE_SIGNED == 'false' && env.UPLOAD_ARTIFACTS == 'true' + if: env.IS_BUILD_SIGNED == 'false' && env.UPLOAD_ARTIFACTS == 'true' run: | - mv app/build/outputs/apk/full/reldebug/app-full-reldebug.apk skyline-$GITHUB_RUN_NUMBER-unsigned-reldebug.apk - mv app/build/outputs/apk/full/release/app-full-release.apk skyline-$GITHUB_RUN_NUMBER-unsigned-release.apk + mv app/build/outputs/apk/full/reldebug/app-full-reldebug.apk strato-$GITHUB_RUN_NUMBER-unsigned-reldebug.apk + mv app/build/outputs/apk/full/release/app-full-release.apk strato-$GITHUB_RUN_NUMBER-unsigned-release.apk - name: Upload Unsigned Debug APK - if: env.IS_SKYLINE_SIGNED == 'false' && env.UPLOAD_ARTIFACTS == 'true' + if: env.IS_BUILD_SIGNED == 'false' && env.UPLOAD_ARTIFACTS == 'true' uses: actions/upload-artifact@v3 with: - name: skyline-${{ github.run_number }}-unsigned-reldebug.apk - path: skyline-${{ github.run_number }}-unsigned-reldebug.apk + name: strato-${{ github.run_number }}-unsigned-reldebug.apk + path: strato-${{ github.run_number }}-unsigned-reldebug.apk - name: Upload Unsigned Release APK - if: env.IS_SKYLINE_SIGNED == 'false' && env.UPLOAD_ARTIFACTS == 'true' + if: env.IS_BUILD_SIGNED == 'false' && env.UPLOAD_ARTIFACTS == 'true' uses: actions/upload-artifact@v3 with: - name: skyline-${{ github.run_number }}-unsigned-release.apk - path: skyline-${{ github.run_number }}-unsigned-release.apk + name: strato-${{ github.run_number }}-unsigned-release.apk + path: strato-${{ github.run_number }}-unsigned-release.apk diff --git a/.github/workflows/edge-ci.yml b/.github/workflows/edge-ci.yml deleted file mode 100644 index 1c0ef7b3..00000000 --- a/.github/workflows/edge-ci.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Edge CI - -on: - pull_request_target: - types: [synchronize, reopened, closed, labeled, unlabeled] - -jobs: - update-patches: - # Run if the 'edge' label was added/removed, or if an edge PR was synchronized/reopened/closed - if: | - github.event.label.name == 'edge' || - !contains(github.event.action, 'labeled') && contains(github.event.pull_request.labels.*.name, 'edge') - runs-on: ubuntu-latest - steps: - - name: Update Edge patches - uses: peter-evans/repository-dispatch@v2 - with: - token: ${{ secrets.EDGE_PATCH_PAT }} - repository: skyline-emu/edge-patch - event-type: update-patches