diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 043d22ea..b7582cec 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -105,101 +105,3 @@ jobs: with: name: purrfectsnap-armv8-debug path: app/build/outputs/apk/armv8/debug/*.apk - job_armv7: - runs-on: ubuntu-latest - outputs: - armv7_apk: ${{ steps.upload_apk.outputs.artifact-paths }} - steps: - - name: Checkout repo - uses: actions/checkout@v4 - with: - submodules: 'recursive' - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - java-version: '21' - distribution: 'temurin' - cache: gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Setup NPM Dependencies - run: npm install typescript -g - - name: Add Android targets for Rust - run: rustup target add armv7-linux-androideabi aarch64-linux-android - - name: Prepare release keystore for Gradle signing - env: - SIGNING_KEY_BASE64: ${{ secrets.PS_BASE_64 }} - SIGNING_KEY_ALIAS: ${{ secrets.PS_RELEASE_KEY_ALIAS }} - SIGNING_KEY_PASSWORD: ${{ secrets.PS_RELEASE_KEY_PASSWORD }} - SIGNING_STORE_PASSWORD: ${{ secrets.PS_RELEASE_STORE_PASSWORD }} - run: | - set -euo pipefail - if [ -z "${SIGNING_KEY_BASE64}" ] || [ -z "${SIGNING_KEY_ALIAS}" ] || [ -z "${SIGNING_STORE_PASSWORD}" ] || [ -z "${SIGNING_KEY_PASSWORD}" ]; then - echo "Signing secrets are missing. Ensure PS_BASE_64, PS_RELEASE_KEY_ALIAS, PS_RELEASE_STORE_PASSWORD, PS_RELEASE_KEY_PASSWORD are set." >&2 - exit 1 - fi - mkdir -p "${HOME}/.android" - printf '%s' "${SIGNING_KEY_BASE64}" | base64 --decode > "${HOME}/.android/purrfectsnap-release.keystore" - if [ ! -s "${HOME}/.android/purrfectsnap-release.keystore" ]; then - echo "Decoded keystore is empty or invalid." >&2 - exit 1 - fi - mkdir -p "${HOME}/.gradle" - { - echo "PS_RELEASE_STORE_PASSWORD=${SIGNING_STORE_PASSWORD}" - echo "PS_RELEASE_KEY_ALIAS=${SIGNING_KEY_ALIAS}" - echo "PS_RELEASE_KEY_PASSWORD=${SIGNING_KEY_PASSWORD}" - } >> "${HOME}/.gradle/gradle.properties" - - name: Build - run: ./gradlew --configuration-cache assembleArmv7Debug - - name: Determine the latest Build Tools version installed - shell: bash - run: | - SDK_ROOT="${ANDROID_SDK_ROOT:-$ANDROID_HOME}" - echo "SDK_ROOT=${SDK_ROOT}" >> $GITHUB_ENV - echo "BUILD_TOOL_VERSION=$(ls "${SDK_ROOT}/build-tools/" | tail -n 1)" >> $GITHUB_ENV - - name: Sign APK - env: - BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }} - SIGNING_KEY_BASE64: ${{ secrets.PS_BASE_64 }} - SIGNING_KEY_ALIAS: ${{ secrets.PS_RELEASE_KEY_ALIAS }} - SIGNING_KEY_PASSWORD: ${{ secrets.PS_RELEASE_KEY_PASSWORD }} - SIGNING_STORE_PASSWORD: ${{ secrets.PS_RELEASE_STORE_PASSWORD }} - run: | - set -euo pipefail - SIGNING_DIR="app/build/outputs/apk/armv7/debug" - KEYSTORE_PATH="${SIGNING_DIR}/signingKey.jks" - if [ -z "${SIGNING_KEY_BASE64}" ] || [ -z "${SIGNING_KEY_ALIAS}" ] || [ -z "${SIGNING_STORE_PASSWORD}" ] || [ -z "${SIGNING_KEY_PASSWORD}" ]; then - echo "Signing secrets are missing. Ensure PS_BASE_64, PS_RELEASE_KEY_ALIAS, PS_RELEASE_STORE_PASSWORD, PS_RELEASE_KEY_PASSWORD are set." >&2 - exit 1 - fi - printf '%s' "${SIGNING_KEY_BASE64}" | base64 --decode > "${KEYSTORE_PATH}" - if [ ! -s "${KEYSTORE_PATH}" ]; then - echo "Decoded keystore is empty or invalid." >&2 - exit 1 - fi - APK_INPUT=$(ls "${SIGNING_DIR}"/*.apk | head -n 1) - "${ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION}/zipalign" -v 4 "${APK_INPUT}" "${SIGNING_DIR}/purrfectsnap-armv7Debug-aligned.apk" - "${ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION}/apksigner" sign \ - --ks "${KEYSTORE_PATH}" \ - --ks-key-alias "${SIGNING_KEY_ALIAS}" \ - --ks-pass "pass:${SIGNING_STORE_PASSWORD}" \ - --key-pass "pass:${SIGNING_KEY_PASSWORD}" \ - --ks-type JKS \ - --out "${SIGNING_DIR}/purrfectsnap-armv7Debug-signed.apk" \ - "${SIGNING_DIR}/purrfectsnap-armv7Debug-aligned.apk" - - name: Get current build version - id: version-env - run: | - ./gradlew --configuration-cache getVersion - echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV - - name: Delete unsigned APK file and rename the signed one - run: | - find app/build/outputs/apk/armv7/debug/ -type f ! -name '*-signed*' -delete - mv app/build/outputs/apk/armv7/debug/purrfectsnap-armv7Debug-signed.apk app/build/outputs/apk/armv7/debug/purrfectsnap-${{ env.version }}-armv7-${GITHUB_SHA::7}.apk - - name: Upload artifact - id: upload_apk - uses: actions/upload-artifact@v4 - with: - name: purrfectsnap-armv7-debug - path: app/build/outputs/apk/armv7/debug/*.apk diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 0b7580ec..4eeaba38 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -26,7 +26,7 @@ jobs: run: npm install typescript -g - name: Add Android targets for Rust - run: rustup target add armv7-linux-androideabi aarch64-linux-android + run: rustup target add aarch64-linux-android - name: Build run: ./gradlew --configuration-cache assembleArmv8Debug @@ -46,49 +46,6 @@ jobs: with: name: purrfectsnap-armv8-debug path: app/build/outputs/apk/armv8/debug/*.apk - - job_armv7: - runs-on: macos-latest - steps: - - name: Checkout repo - uses: actions/checkout@v4 - with: - submodules: 'recursive' - - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - java-version: '21' - distribution: 'temurin' - cache: gradle - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Setup NPM Dependencies - run: npm install typescript -g - - - name: Add Android targets for Rust - run: rustup target add armv7-linux-androideabi aarch64-linux-android - - - name: Build - run: ./gradlew --configuration-cache assembleArmv7Debug - - - name: Get current build version - id: version-env - run: | - ./gradlew --configuration-cache getVersion - echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV - - - name: Rename APK file - run: | - mv app/build/outputs/apk/armv7/debug/*.apk app/build/outputs/apk/armv7/debug/purrfectsnap-${{ env.version }}-armv7-${GITHUB_SHA::7}.apk - - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: purrfectsnap-armv7-debug - path: app/build/outputs/apk/armv7/debug/*.apk job_manager: runs-on: ubuntu-latest @@ -136,7 +93,7 @@ jobs: run: chmod +x gradlew - name: Add Android targets for Rust - run: rustup target add armv7-linux-androideabi aarch64-linux-android + run: rustup target add aarch64-linux-android - name: Build run: ./gradlew --configuration-cache assembleCoreDebug diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 51182284..1c4b193a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: - name: Setup NPM Dependencies run: npm install typescript -g - name: Add Android targets for Rust - run: rustup target add armv7-linux-androideabi aarch64-linux-android + run: rustup target add aarch64-linux-android - name: Prepare release keystore for Gradle signing env: SIGNING_KEY_BASE64: ${{ secrets.PS_BASE_64 }} @@ -107,106 +107,8 @@ jobs: with: name: purrfectsnap-armv8-release path: app/build/outputs/apk/armv8/release/*.apk - job_armv7: - runs-on: ubuntu-latest - outputs: - armv7_apk: ${{ steps.upload_apk.outputs.artifact-paths }} - steps: - - name: Checkout repo - uses: actions/checkout@v4.2.2 - with: - submodules: 'recursive' - - name: Set up JDK 21 - uses: actions/setup-java@v4.7.0 - with: - java-version: '21' - distribution: 'temurin' - cache: gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Setup NPM Dependencies - run: npm install typescript -g - - name: Add Android targets for Rust - run: rustup target add armv7-linux-androideabi aarch64-linux-android - - name: Prepare release keystore for Gradle signing - env: - SIGNING_KEY_BASE64: ${{ secrets.PS_BASE_64 }} - SIGNING_KEY_ALIAS: ${{ secrets.PS_RELEASE_KEY_ALIAS }} - SIGNING_KEY_PASSWORD: ${{ secrets.PS_RELEASE_KEY_PASSWORD }} - SIGNING_STORE_PASSWORD: ${{ secrets.PS_RELEASE_STORE_PASSWORD }} - run: | - set -euo pipefail - if [ -z "${SIGNING_KEY_BASE64}" ] || [ -z "${SIGNING_KEY_ALIAS}" ] || [ -z "${SIGNING_STORE_PASSWORD}" ] || [ -z "${SIGNING_KEY_PASSWORD}" ]; then - echo "Signing secrets are missing. Ensure PS_BASE_64, PS_RELEASE_KEY_ALIAS, PS_RELEASE_STORE_PASSWORD, PS_RELEASE_KEY_PASSWORD are set." >&2 - exit 1 - fi - mkdir -p "${HOME}/.android" - printf '%s' "${SIGNING_KEY_BASE64}" | base64 --decode > "${HOME}/.android/purrfectsnap-release.keystore" - if [ ! -s "${HOME}/.android/purrfectsnap-release.keystore" ]; then - echo "Decoded keystore is empty or invalid." >&2 - exit 1 - fi - mkdir -p "${HOME}/.gradle" - { - echo "PS_RELEASE_STORE_PASSWORD=${SIGNING_STORE_PASSWORD}" - echo "PS_RELEASE_KEY_ALIAS=${SIGNING_KEY_ALIAS}" - echo "PS_RELEASE_KEY_PASSWORD=${SIGNING_KEY_PASSWORD}" - } >> "${HOME}/.gradle/gradle.properties" - - name: Build - run: ./gradlew --configuration-cache assembleArmv7Release - - name: Determine the latest Build Tools version installed - shell: bash - run: | - SDK_ROOT="${ANDROID_SDK_ROOT:-$ANDROID_HOME}" - echo "SDK_ROOT=${SDK_ROOT}" >> $GITHUB_ENV - echo "BUILD_TOOL_VERSION=$(ls "${SDK_ROOT}/build-tools/" | tail -n 1)" >> $GITHUB_ENV - - name: Sign APK - env: - BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }} - SIGNING_KEY_BASE64: ${{ secrets.PS_BASE_64 }} - SIGNING_KEY_ALIAS: ${{ secrets.PS_RELEASE_KEY_ALIAS }} - SIGNING_KEY_PASSWORD: ${{ secrets.PS_RELEASE_KEY_PASSWORD }} - SIGNING_STORE_PASSWORD: ${{ secrets.PS_RELEASE_STORE_PASSWORD }} - run: | - set -euo pipefail - SIGNING_DIR="app/build/outputs/apk/armv7/release" - KEYSTORE_PATH="${SIGNING_DIR}/signingKey.jks" - if [ -z "${SIGNING_KEY_BASE64}" ] || [ -z "${SIGNING_KEY_ALIAS}" ] || [ -z "${SIGNING_STORE_PASSWORD}" ] || [ -z "${SIGNING_KEY_PASSWORD}" ]; then - echo "Signing secrets are missing. Ensure PS_BASE_64, PS_RELEASE_KEY_ALIAS, PS_RELEASE_STORE_PASSWORD, PS_RELEASE_KEY_PASSWORD are set." >&2 - exit 1 - fi - printf '%s' "${SIGNING_KEY_BASE64}" | base64 --decode > "${KEYSTORE_PATH}" - if [ ! -s "${KEYSTORE_PATH}" ]; then - echo "Decoded keystore is empty or invalid." >&2 - exit 1 - fi - APK_INPUT=$(ls "${SIGNING_DIR}"/*.apk | head -n 1) - "${SDK_ROOT}/build-tools/${BUILD_TOOLS_VERSION}/zipalign" -v 4 "${APK_INPUT}" "${SIGNING_DIR}/purrfectsnap-armv7Release-aligned.apk" - "${SDK_ROOT}/build-tools/${BUILD_TOOLS_VERSION}/apksigner" sign \ - --ks "${KEYSTORE_PATH}" \ - --ks-key-alias "${SIGNING_KEY_ALIAS}" \ - --ks-pass "pass:${SIGNING_STORE_PASSWORD}" \ - --key-pass "pass:${SIGNING_KEY_PASSWORD}" \ - --ks-type JKS \ - --out "${SIGNING_DIR}/purrfectsnap-armv7Release-signed.apk" \ - "${SIGNING_DIR}/purrfectsnap-armv7Release-aligned.apk" - - name: Get current build version - id: version-env - run: | - ./gradlew --configuration-cache getVersion - echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV - - name: Delete unsigned APK file and rename the signed one - run: | - find app/build/outputs/apk/armv7/release/ -type f ! -name '*-signed*' -delete - mv app/build/outputs/apk/armv7/release/purrfectsnap-armv7Release-signed.apk app/build/outputs/apk/armv7/release/purrfectsnap_${{ env.version }}-armv7Release.apk - - name: Upload artifact - id: upload_apk - uses: actions/upload-artifact@v4.6.2 - with: - name: purrfectsnap-armv7-release - path: app/build/outputs/apk/armv7/release/*.apk make_release: - needs: [job_armv7, job_armv8] + needs: [job_armv8] runs-on: ubuntu-latest steps: - name: Checkout repo diff --git a/settings.gradle.kts b/settings.gradle.kts index 7007fcab..988894e9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -128,7 +128,4 @@ include(":core") include(":valdi") include(":app") include(":mapper") -include(":manager") include(":native") - -project(":manager").projectDir = file("mapper")