diff --git a/.github/workflows/build-nym-vpn-android.yml b/.github/workflows/build-nym-vpn-android.yml index af523fa6cf..ca2c8ceb7a 100644 --- a/.github/workflows/build-nym-vpn-android.yml +++ b/.github/workflows/build-nym-vpn-android.yml @@ -12,6 +12,10 @@ on: - prerelease - nightly - release + core_build: + description: "Core release version tag or \"source"\" + required: true + default: source secrets: ANDROID_SIGNING_KEY_ALIAS: required: false @@ -32,6 +36,10 @@ on: description: "Build type" required: true default: debug + core_build: + description: "Core release version tag or \"source"\" + required: true + default: source secrets: ANDROID_SIGNING_KEY_ALIAS: required: false @@ -129,25 +137,25 @@ jobs: - name: Build Fdroid Release APK if: ${{ inputs.build_type == 'release' }} - run: ./gradlew :app:assembleFdroidRelease --info + run: ./gradlew :app:assembleFdroidRelease -PlibVersion=${{ inputs.core_build }} --info env: ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} - name: Build Fdroid Prerelease APK if: ${{ inputs.build_type == 'prerelease' }} - run: ./gradlew :app:assembleFdroidPrerelease --info + run: ./gradlew :app:assembleFdroidPrerelease -PlibVersion=${{ inputs.core_build }} --info env: ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} - name: Build Fdroid Nightly APK if: ${{ inputs.build_type == 'nightly' }} - run: ./gradlew :app:assembleFdroidNightly --info + run: ./gradlew :app:assembleFdroidNightly -PlibVersion=${{ inputs.core_build }} --info env: ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} - name: Build Debug APK if: ${{ inputs.build_type == 'debug' }} - run: ./gradlew :app:assembleFdroidDebug --stacktrace + run: ./gradlew :app:assembleFdroidDebug -PlibVersion=${{ inputs.core_build }} --stacktrace env: ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} diff --git a/.github/workflows/publish-nym-vpn-android.yml b/.github/workflows/publish-nym-vpn-android.yml index 06f7c8ffd6..f0d06095a5 100644 --- a/.github/workflows/publish-nym-vpn-android.yml +++ b/.github/workflows/publish-nym-vpn-android.yml @@ -38,6 +38,10 @@ on: - release default: release required: true + core_build: + description: "Core release version tag or \"source"\" + required: true + default: source push: tags: @@ -53,7 +57,7 @@ jobs: secrets: inherit with: build_type: ${{ inputs.release_type == '' && 'nightly' || inputs.release_type }} - + core_build: ${{ inputs.core_build == '' && 'source' || inputs.core_build }} publish-github: if: ${{ inputs.release_type != 'none' }}