Skip to content

Commit

Permalink
better CI build
Browse files Browse the repository at this point in the history
  • Loading branch information
ShirosakiMio committed Feb 3, 2024
1 parent 08c935e commit 4b6523a
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 49 deletions.
44 changes: 0 additions & 44 deletions .github/workflows/debug.yml

This file was deleted.

32 changes: 29 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ on:
workflow_dispatch:

jobs:
build:
if: github.repository_owner == 'FCL-Team'
FCLTeamBuild:
strategy:
matrix:
arch: [ "all", "arm", "arm64", "x86", "x64" ]
fail-fast: false
env:
FCL_KEYSTORE_PASSWORD: ${{ secrets.FCL_KEYSTORE_PASSWORD }}
name: Build for ${{matrix.arch}}
if: github.repository_owner == 'FCL-Team'
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
Expand All @@ -45,10 +45,36 @@ jobs:
files: |
FCL/build/outputs/apk/release/*.apk
- name: upload apk
- name: Upload apk
if: startsWith(github.ref, 'refs/heads/')
uses: actions/upload-artifact@v3
with:
name: app-${{matrix.arch}}
path: FCL/build/outputs/apk/release/*
# retention-days: 1

#only for fork
DebugBuild:
if: github.repository_owner != 'FCL-Team'
name: Build Debug
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- name: set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 17

- name: Build debug apk
run: |
chmod +x gradlew
./gradlew assemblefordebug -Darch=all
- name: Upload debug apk
uses: actions/upload-artifact@v3
with:
name: app-debug-all
path: FCL/build/outputs/apk/fordebug/*
2 changes: 1 addition & 1 deletion FCL/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ android {
signingConfig signingConfigs.FCLKey
}
fordebug {
applicationIdSuffix ".debug"
initWith debug
applicationIdSuffix ".debug"
signingConfig signingConfigs.FCLDebugKey
}
configureEach {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
plugins {
id 'com.android.application' version '8.1.3' apply false
id 'com.android.library' version '8.1.3' apply false
}
}

0 comments on commit 4b6523a

Please sign in to comment.