diff --git a/.github/workflows/build.yml b/.github/workflows/build-apk.yml similarity index 71% rename from .github/workflows/build.yml rename to .github/workflows/build-apk.yml index 72de6d5..cdb58f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build-apk.yml @@ -1,4 +1,4 @@ -name: EAS Build +name: Build APK on: workflow_dispatch: @@ -42,7 +42,16 @@ jobs: with: distribution: 'temurin' java-version: '17' - + - name: Install SDKMAN + run: | + curl -s "https://get.sdkman.io" | bash + source "$HOME/.sdkman/bin/sdkman-init.sh" + sdk version + - name: Install Kotlin 1.9.0 with SDKMAN + run: | + source "$HOME/.sdkman/bin/sdkman-init.sh" + sdk install kotlin 1.9.0 + - name: Install dependencies run: pnpm install --no-frozen-lockfile @@ -67,6 +76,17 @@ jobs: - name: Build apk run: cd android/app && gradle assembleRelease + ## sign generated apk + - name: Sign APK + id: sign_app + uses: r0adkll/sign-android-release@v1 + with: + releaseDirectory: android/app/build/outputs/apk/release + signingKeyBase64: ${{ secrets.ANDROID_SIGNING_KEY }} + alias: ${{ secrets.ANDROID_ALIAS }} + keyStorePassword: ${{ secrets.ANDROID_KEY_STORE_PASSWORD }} + keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }} + - name: Create Release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/eas-build.yml b/.github/workflows/eas-build.yml index 9afe572..dec9279 100644 --- a/.github/workflows/eas-build.yml +++ b/.github/workflows/eas-build.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: tags: - - 'v*.*.*' + - 'eas-v*.*.*' paths-ignore: - 'README.md' - 'wiki/**' @@ -12,17 +12,6 @@ on: - 'scripts/**' - '.vscode' - '.idea' - pull_request: - branches: - - master - - main - paths-ignore: - - 'README.md' - - 'wiki/**' - - 'public/**' - - '.scripts/**' - - '.vscode' - - '.idea' jobs: build: diff --git a/.gitignore b/.gitignore index 96b03f1..1e103ea 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ scripts/fetchHTML/ # generated plugin from `npm run build:plugin` # Not ignoring this, to prevent [stderr] None of these files exist: * syncadaptor-ui.html # assets/plugins/ +@tiddly-gittly__tidgi-mobile.jks.base64.txt