mirror of
https://github.com/vodemn/m3_lightmeter.git
synced 2024-12-04 13:20:39 +00:00
Compare commits
6 commits
8e03d3e400
...
078312c03f
Author | SHA1 | Date | |
---|---|---|---|
|
078312c03f | ||
|
e3306ab3ba | ||
|
17c454e4c6 | ||
|
bffa598493 | ||
|
e376391529 | ||
|
411ec927a9 |
3 changed files with 15 additions and 35 deletions
45
.github/workflows/create_release.yml
vendored
45
.github/workflows/create_release.yml
vendored
|
@ -26,7 +26,7 @@ on:
|
||||||
description: "Run integration tests"
|
description: "Run integration tests"
|
||||||
required: true
|
required: true
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
run-integration-tests:
|
run-integration-tests:
|
||||||
|
@ -63,7 +63,6 @@ jobs:
|
||||||
generate-release-notes:
|
generate-release-notes:
|
||||||
name: Generate release notes
|
name: Generate release notes
|
||||||
needs: [build-android, build-ios]
|
needs: [build-android, build-ios]
|
||||||
if: ${{ always() && !failure() && !cancelled() }}
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Generate release notes
|
- name: Generate release notes
|
||||||
|
@ -88,6 +87,11 @@ jobs:
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
|
- name: Download apk
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
|
with:
|
||||||
|
name: m3_lightmeter_apk
|
||||||
|
|
||||||
- name: Increment build number & replace version number
|
- name: Increment build number & replace version number
|
||||||
run: bash ./.github/scripts/increment_build_number.sh ${{ github.event.inputs.version }}
|
run: bash ./.github/scripts/increment_build_number.sh ${{ github.event.inputs.version }}
|
||||||
|
|
||||||
|
@ -105,11 +109,6 @@ jobs:
|
||||||
branch: ${{ github.ref_name }}
|
branch: ${{ github.ref_name }}
|
||||||
unprotect_reviews: true
|
unprotect_reviews: true
|
||||||
|
|
||||||
- name: Download apk
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: m3_lightmeter_apk
|
|
||||||
|
|
||||||
- name: Rename apk
|
- name: Rename apk
|
||||||
run: mv app-prod-release.apk m3_lightmeter.apk
|
run: mv app-prod-release.apk m3_lightmeter.apk
|
||||||
|
|
||||||
|
@ -125,11 +124,6 @@ jobs:
|
||||||
tag: "v${{ github.event.inputs.version }}"
|
tag: "v${{ github.event.inputs.version }}"
|
||||||
bodyFile: "whatsnew-en-US.md"
|
bodyFile: "whatsnew-en-US.md"
|
||||||
|
|
||||||
- name: Delete apk artifact
|
|
||||||
uses: geekyeggo/delete-artifact@v2
|
|
||||||
with:
|
|
||||||
name: m3_lightmeter_apk
|
|
||||||
|
|
||||||
create-google-play-release:
|
create-google-play-release:
|
||||||
name: Create Google Play release
|
name: Create Google Play release
|
||||||
needs: [generate-release-notes]
|
needs: [generate-release-notes]
|
||||||
|
@ -181,24 +175,6 @@ jobs:
|
||||||
debugSymbols: merged_native_libs.zip
|
debugSymbols: merged_native_libs.zip
|
||||||
whatsNewDirectory: whatsnew
|
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:
|
upload-to-app-store:
|
||||||
name: Upload to App Store
|
name: Upload to App Store
|
||||||
needs: [generate-release-notes]
|
needs: [generate-release-notes]
|
||||||
|
@ -223,7 +199,12 @@ jobs:
|
||||||
[create-github-release, create-google-play-release, upload-to-app-store]
|
[create-github-release, create-google-play-release, upload-to-app-store]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Delete release notes artifact
|
- name: Delete release artifacts
|
||||||
uses: geekyeggo/delete-artifact@v2
|
uses: geekyeggo/delete-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: whatsnew-en-US
|
failOnError: false
|
||||||
|
name: |
|
||||||
|
m3_lightmeter_apk
|
||||||
|
m3_lightmeter_appbundle
|
||||||
|
m3_lightmeter_ipa
|
||||||
|
whatsnew-en-US
|
||||||
|
|
1
.github/workflows/run_integration_tests.yml
vendored
1
.github/workflows/run_integration_tests.yml
vendored
|
@ -20,7 +20,6 @@ jobs:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
- name: Override iap package with stub
|
- name: Override iap package with stub
|
||||||
id: override-iap
|
|
||||||
run: bash ./.github/scripts/stub_iap.sh
|
run: bash ./.github/scripts/stub_iap.sh
|
||||||
|
|
||||||
- name: Restore secrets
|
- name: Restore secrets
|
||||||
|
|
|
@ -54,10 +54,10 @@ class IAPProducts extends InheritedModel<IAPProductType> {
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool updateShouldNotify(IAPProducts oldWidget) => false;
|
bool updateShouldNotify(IAPProducts oldWidget) => true;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool updateShouldNotifyDependent(IAPProducts oldWidget, Set<IAPProductType> dependencies) => false;
|
bool updateShouldNotifyDependent(IAPProducts oldWidget, Set<IAPProductType> dependencies) => true;
|
||||||
|
|
||||||
IAPProduct? _findProduct(IAPProductType type) {
|
IAPProduct? _findProduct(IAPProductType type) {
|
||||||
try {
|
try {
|
||||||
|
|
Loading…
Reference in a new issue