Compare commits

..

No commits in common. "078312c03f8d273405bb875f8624ccbd668b2d05" and "8e03d3e40008ff22a56d0b88e17f246b80686b7e" have entirely different histories.

3 changed files with 35 additions and 15 deletions

View file

@ -26,7 +26,7 @@ on:
description: "Run integration tests"
required: true
type: boolean
default: true
default: false
jobs:
run-integration-tests:
@ -63,6 +63,7 @@ jobs:
generate-release-notes:
name: Generate release notes
needs: [build-android, build-ios]
if: ${{ always() && !failure() && !cancelled() }}
runs-on: ubuntu-latest
steps:
- name: Generate release notes
@ -87,11 +88,6 @@ jobs:
with:
submodules: recursive
- name: Download apk
uses: actions/download-artifact@v3
with:
name: m3_lightmeter_apk
- name: Increment build number & replace version number
run: bash ./.github/scripts/increment_build_number.sh ${{ github.event.inputs.version }}
@ -109,6 +105,11 @@ jobs:
branch: ${{ github.ref_name }}
unprotect_reviews: true
- name: Download apk
uses: actions/download-artifact@v3
with:
name: m3_lightmeter_apk
- name: Rename apk
run: mv app-prod-release.apk m3_lightmeter.apk
@ -124,6 +125,11 @@ jobs:
tag: "v${{ github.event.inputs.version }}"
bodyFile: "whatsnew-en-US.md"
- name: Delete apk artifact
uses: geekyeggo/delete-artifact@v2
with:
name: m3_lightmeter_apk
create-google-play-release:
name: Create Google Play release
needs: [generate-release-notes]
@ -175,6 +181,24 @@ jobs:
debugSymbols: merged_native_libs.zip
whatsNewDirectory: whatsnew
# https://docs.github.com/en/actions/learn-github-actions/expressions#failure-with-conditions
- name: Zip app bundle and merged_native_libs
if: ${{ failure() && steps.create-google-play-release-step.conclusion == 'failure' }}
run: zip m3_lightmeter_release.zip app-prod-release.aab merged_native_libs.zip
- name: Upload release zip to artifacts
if: ${{ failure() && steps.create-google-play-release-step.conclusion == 'failure' }}
uses: actions/upload-artifact@v3
with:
name: m3_lightmeter_release
path: m3_lightmeter_release.zip
- name: Delete app bundle & merged native libs artifacts
if: ${{ always() }}
uses: geekyeggo/delete-artifact@v2
with:
name: m3_lightmeter_appbundle
upload-to-app-store:
name: Upload to App Store
needs: [generate-release-notes]
@ -199,12 +223,7 @@ jobs:
[create-github-release, create-google-play-release, upload-to-app-store]
runs-on: ubuntu-latest
steps:
- name: Delete release artifacts
- name: Delete release notes artifact
uses: geekyeggo/delete-artifact@v2
with:
failOnError: false
name: |
m3_lightmeter_apk
m3_lightmeter_appbundle
m3_lightmeter_ipa
whatsnew-en-US
name: whatsnew-en-US

View file

@ -20,6 +20,7 @@ jobs:
submodules: recursive
- name: Override iap package with stub
id: override-iap
run: bash ./.github/scripts/stub_iap.sh
- name: Restore secrets

View file

@ -54,10 +54,10 @@ class IAPProducts extends InheritedModel<IAPProductType> {
}
@override
bool updateShouldNotify(IAPProducts oldWidget) => true;
bool updateShouldNotify(IAPProducts oldWidget) => false;
@override
bool updateShouldNotifyDependent(IAPProducts oldWidget, Set<IAPProductType> dependencies) => true;
bool updateShouldNotifyDependent(IAPProducts oldWidget, Set<IAPProductType> dependencies) => false;
IAPProduct? _findProduct(IAPProductType type) {
try {