diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 710e3f107..e1b93cd2b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,8 +62,8 @@ jobs: target: aab - os: ubuntu-latest platform: linux - # - os: macos-latest - # platform: ios + - os: macos-latest + platform: ios runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -293,8 +293,10 @@ jobs: VERSION: ${{ env.version }} run: | make ${{ matrix.platform }}-${{ matrix.target }}-release - @echo "Generating debug symbols" - make debug-symbols + + - name: Generate debug symbols + if: matrix.platform == 'android' && matrix.target == 'aab' + run: make debug-symbols - name: Build Flutter app if: matrix.platform != 'windows' && matrix.platform != 'android' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6ce5fe78..9013cdeb4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -141,19 +141,19 @@ jobs: with: name: android-aab-build - # - name: Download the IPA - # uses: actions/download-artifact@v4 - # with: - # name: Lantern.ipa - - # - name: Upload Lantern to TestFlight - # uses: apple-actions/upload-testflight-build@v1 - # if: (needs.set-version.outputs.prefix == 'lantern-installer-preview'|| needs.set-version.outputs.prefix == 'lantern-installer') && (needs.determine-platform.outputs.platform == 'ios' || needs.determine-platform.outputs.platform == 'all') - # with: - # app-path: Lantern.ipa - # issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }} - # api-key-id: ${{ secrets.APPSTORE_API_KEY_ID }} - # api-private-key: ${{ secrets.APPSTORE_API_PRIVATE_KEY }} + - name: Download the IPA + uses: actions/download-artifact@v4 + with: + name: Lantern.ipa + + - name: Upload Lantern to TestFlight + uses: apple-actions/upload-testflight-build@v1 + if: (needs.set-version.outputs.prefix == 'lantern-installer-preview'|| needs.set-version.outputs.prefix == 'lantern-installer') && (needs.determine-platform.outputs.platform == 'ios' || needs.determine-platform.outputs.platform == 'all') + with: + app-path: Lantern.ipa + issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }} + api-key-id: ${{ secrets.APPSTORE_API_KEY_ID }} + api-private-key: ${{ secrets.APPSTORE_API_PRIVATE_KEY }} - name: Upload Android App bundle to Play Store (beta) if: needs.set-version.outputs.prefix == 'lantern-installer-preview' && (needs.determine-platform.outputs.platform == 'android' || needs.determine-platform.outputs.platform == 'all') @@ -166,7 +166,6 @@ jobs: debugSymbols: ${{ github.workspace }}/build/outputs/debug-symbols/debug-symbols.zip mappingFile: ${{ github.workspace }}/build/app/outputs/mapping/prodPlay/mapping.txt - - name: Upload Android App bundle to Play Store (production) if: needs.set-version.outputs.prefix == 'lantern-installer' && (needs.determine-platform.outputs.platform == 'android' || needs.determine-platform.outputs.platform == 'all') uses: r0adkll/upload-google-play@v1 diff --git a/Makefile b/Makefile index 10bccd2a6..031b444e9 100644 --- a/Makefile +++ b/Makefile @@ -352,7 +352,7 @@ $(ANDROID_LIB): $(GO_SOURCES) -target=$(ANDROID_ARCH_GOMOBILE) \ -tags='headless lantern' -o=$(ANDROID_LIB) \ -androidapi=23 \ - -ldflags="$(LDFLAGS) $(EXTRA_LDFLAGS)" \ + -ldflags="-s -w $(LDFLAGS) $(EXTRA_LDFLAGS)" \ $(GOMOBILE_EXTRA_BUILD_FLAGS) \ github.com/getlantern/lantern-client/internalsdk github.com/getlantern/pathdb/testsupport github.com/getlantern/pathdb/minisql