Get CI working

This commit is contained in:
Damontecres 2025-11-05 17:26:03 -05:00
parent 9a093afd38
commit ce8568b51c
No known key found for this signature in database
7 changed files with 31 additions and 57 deletions

View file

@ -18,8 +18,6 @@ env:
APK_SHORT_NAME: Wholphin-release.apk
APK_DEBUG_SHORT_NAME: Wholphin-debug.apk
BRANCH_NAME: ${{ github.ref_name }}
BUILD_TOOLS_VERSION: 36.0.0
NDK_VERSION: "29.0.14206865"
jobs:
build:
@ -31,17 +29,12 @@ jobs:
uses: actions/checkout@v5
with:
fetch-depth: 0 # Need the tags to build
# Setup the SDKs
- name: Setup JDK
uses: actions/setup-java@v5
- name: Setup
uses: ./.github/actions/setup
- name: Native build
uses: ./.github/actions/native-build
with:
distribution: zulu
java-version: '21'
cache: 'gradle'
- name: Setup Android SDK
uses: android-actions/setup-android@v3
with:
packages: "tools platform-tools build-tools;${{ env.BUILD_TOOLS_VERSION }} ndk;${{ env.NDK_VERSION }}"
cache: true
- name: Get version names
run: |
@ -56,25 +49,6 @@ jobs:
echo "LATEST_TAG=$LATEST_TAG" >> "$GITHUB_ENV"
echo "VERSION_NAME=$VERSION_NAME" >> "$GITHUB_ENV"
echo "TAG_NAME=$TAG_NAME" >> "$GITHUB_ENV"
- name: Load ffmpeg module cache
id: cache_ffmpeg_module
uses: actions/cache/restore@v4
with:
path: |
app/libs
key: ${{ runner.os }}-ffmpeg-${{ hashFiles('**/libs.versions.toml', '**/build_ffmpeg_decoder.sh') }}
- name: Build ffmpeg decoder
id: ffmpeg-decoder
if: steps.cache_ffmpeg_module.outputs.cache-hit != 'true'
run: |
./build_ffmpeg_decoder.sh "${{ env.ANDROID_SDK_ROOT }}/ndk/${{ env.NDK_VERSION }}"
- name: Save ffmpeg module cache
id: cache_ffmpeg_module_save
uses: actions/cache/save@v4
with:
path: |
app/libs
key: ${{ steps.cache_ffmpeg_module.outputs.cache-primary-key }}
- name: Build release app
id: build
env:

View file

@ -42,11 +42,11 @@ jobs:
- name: Build app
id: buildapp
run: |
./gradlew clean build
./gradlew clean assembleDebug
echo "apk=$(ls app/build/outputs/apk/debug/Wholphin-debug*.apk)" >> "$GITHUB_OUTPUT"
- name: Tar build dirs
run: |
tar -czf build.tgz */build/.
tar -czf build.tgz ./app/.
- uses: actions/upload-artifact@v5
id: upload-build-dirs
with:

View file

@ -11,8 +11,6 @@ defaults:
env:
APK_SHORT_NAME: Wholphin.apk
BUILD_TOOLS_VERSION: 36.0.0
NDK_VERSION: "29.0.14206865"
jobs:
publish:
@ -24,24 +22,12 @@ jobs:
uses: actions/checkout@v5
with:
fetch-depth: 0 # Need the tags to build
- name: Setup Python
uses: actions/setup-python@v5
- name: Setup
uses: ./.github/actions/setup
- name: Native build
uses: ./.github/actions/native-build
with:
python-version: '3.12'
- name: Setup JDK
uses: actions/setup-java@v5
with:
distribution: zulu
java-version: '21'
cache: 'gradle'
- name: Setup Android SDK
uses: android-actions/setup-android@v3
with:
packages: "tools platform-tools build-tools;${{ env.BUILD_TOOLS_VERSION }} ndk;${{ env.NDK_VERSION }}"
- name: Build ffmpeg decoder
id: ffmpeg-decoder
run: |
./build_ffmpeg_decoder.sh "${{ env.ANDROID_SDK_ROOT }}/ndk/${{ env.NDK_VERSION }}"
cache: false
- name: Build app
id: buildapp
env: