From 2fa9b4dfac57e91c84ef39fd7e60bc19d4c8e639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Carmo?= <17721880+joaocarmo@users.noreply.github.com> Date: Sun, 20 Feb 2022 19:27:45 +0000 Subject: [PATCH 1/4] [Release] v1.2.0-rc.1 (#33) * :green_heart: Fixes the workflows (#32) --- .github/release-drafter.yml | 2 +- .github/workflows/release-drafter.yml | 2 +- .github/workflows/release-version.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 55010dcc..6c901d04 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,4 +1,4 @@ -name-template: "v$RESOLVED_VERSION 🌈" +name-template: "v$RESOLVED_VERSION" tag-template: "v$RESOLVED_VERSION" categories: - title: "🚀 Features" diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 73a52d09..7f465cdd 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -4,7 +4,7 @@ name: Release Drafter on: push: branches: - - main + - next jobs: update_release_draft: diff --git a/.github/workflows/release-version.yml b/.github/workflows/release-version.yml index e82f73c9..fba08f54 100644 --- a/.github/workflows/release-version.yml +++ b/.github/workflows/release-version.yml @@ -4,7 +4,7 @@ name: Release Version on: release: - types: [created] + types: [published] jobs: bump-version: From 549847a29d8195dcc83dfd3408606e70dc744f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Carmo?= <17721880+joaocarmo@users.noreply.github.com> Date: Sun, 20 Feb 2022 19:41:24 +0000 Subject: [PATCH 2/4] :green_heart: Pin down the workflow versions (#34) (#35) --- .github/workflows/publish-app-store.yml | 2 +- .github/workflows/publish-play-store.yml | 2 +- .github/workflows/release-drafter.yml | 2 +- .github/workflows/release-version.yml | 6 +++--- .github/workflows/sourcemaps.yml | 1 - 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-app-store.yml b/.github/workflows/publish-app-store.yml index 2f273ab4..25e995f9 100644 --- a/.github/workflows/publish-app-store.yml +++ b/.github/workflows/publish-app-store.yml @@ -53,7 +53,7 @@ jobs: scripts/prepare-release-ios - name: Build using Xcode - uses: yukiarrr/ios-build-action@v1 + uses: yukiarrr/ios-build-action@v1.5.0 with: project-path: ios/litten.xcodeproj workspace-path: ios/litten.xcworkspace diff --git a/.github/workflows/publish-play-store.yml b/.github/workflows/publish-play-store.yml index 37c0d736..da0ac2e6 100644 --- a/.github/workflows/publish-play-store.yml +++ b/.github/workflows/publish-play-store.yml @@ -89,7 +89,7 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - name: Upload To Play Store - uses: r0adkll/upload-google-play@v1 + uses: r0adkll/upload-google-play@v1.0.16 with: serviceAccountJson: ${{ env.SERVICE_ACCOUNT_PATH }} packageName: com.litten diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 7f465cdd..4b8c95cd 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -10,6 +10,6 @@ jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v5.18.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-version.yml b/.github/workflows/release-version.yml index fba08f54..1ce63ee5 100644 --- a/.github/workflows/release-version.yml +++ b/.github/workflows/release-version.yml @@ -25,7 +25,7 @@ jobs: - name: Get release id: get_release - uses: bruceadams/get-release@v1 + uses: bruceadams/get-release@v1.2.3 env: GITHUB_TOKEN: ${{ secrets.GH_PAT }} @@ -42,13 +42,13 @@ jobs: git push - name: Trigger the App Store build and release - uses: benc-uk/workflow-dispatch@v1 + uses: benc-uk/workflow-dispatch@v1.1 with: workflow: Publish App Store token: ${{ secrets.GH_PAT }} - name: Trigger the Play Store build and release - uses: benc-uk/workflow-dispatch@v1 + uses: benc-uk/workflow-dispatch@v1.1 with: workflow: Publish Play Store token: ${{ secrets.GH_PAT }} diff --git a/.github/workflows/sourcemaps.yml b/.github/workflows/sourcemaps.yml index 89b531ca..25f445ce 100644 --- a/.github/workflows/sourcemaps.yml +++ b/.github/workflows/sourcemaps.yml @@ -24,7 +24,6 @@ jobs: cache: 'yarn' - name: Create .env file run: cp .env.example .env - - uses: c-hive/gha-yarn-cache@v1 - name: Install dependencies run: yarn --frozen-lockfile - name: Android build From 0b02133933742d5f2e3ef1721a7ff878794e0156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Carmo?= <17721880+joaocarmo@users.noreply.github.com> Date: Sun, 20 Feb 2022 19:47:06 +0000 Subject: [PATCH 3/4] Release v1.2.0-rc.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Carmo <17721880+joaocarmo@users.noreply.github.com> --- android/app/build.gradle | 4 ++-- ios/litten.xcodeproj/project.pbxproj | 4 ++-- ios/litten/Info.plist | 14 +++++++------- ios/littenTests/Info.plist | 4 ++-- package.json | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 24aba9ab..88f7f623 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -145,8 +145,8 @@ android { applicationId "com.litten" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 14 - versionName "1.1.0" + versionCode 15 + versionName "1.2.0-rc.2" multiDexEnabled true vectorDrawables.useSupportLibrary = true // Read the API key from ./secure.properties into R.string.maps_api_key diff --git a/ios/litten.xcodeproj/project.pbxproj b/ios/litten.xcodeproj/project.pbxproj index 61e62846..c3d3b46b 100644 --- a/ios/litten.xcodeproj/project.pbxproj +++ b/ios/litten.xcodeproj/project.pbxproj @@ -558,7 +558,7 @@ CODE_SIGN_ENTITLEMENTS = litten/litten.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = P5MX362AFR; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -662,7 +662,7 @@ CODE_SIGN_ENTITLEMENTS = litten/litten.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: Joao Carmo (P5MX362AFR)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = P5MX362AFR; HEADER_SEARCH_PATHS = ( "$(inherited)", diff --git a/ios/litten/Info.plist b/ios/litten/Info.plist index 4d81d579..e13ebea0 100644 --- a/ios/litten/Info.plist +++ b/ios/litten/Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.0 + 1.2.0 CFBundleSignature ???? CFBundleURLTypes @@ -38,9 +38,9 @@ CFBundleVersion - 14 + 15 ITSAppUsesNonExemptEncryption - + LSApplicationQueriesSchemes https @@ -50,17 +50,17 @@ tel LSRequiresIPhoneOS - + NSAppTransportSecurity NSAllowsArbitraryLoads - + NSExceptionDomains localhost NSExceptionAllowsInsecureHTTPLoads - + @@ -92,6 +92,6 @@ UIInterfaceOrientationPortrait UIViewControllerBasedStatusBarAppearance - + diff --git a/ios/littenTests/Info.plist b/ios/littenTests/Info.plist index 5bc1ef2e..8cb07467 100644 --- a/ios/littenTests/Info.plist +++ b/ios/littenTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.1.0 + 1.2.0 CFBundleSignature ???? CFBundleVersion - 14 + 15 diff --git a/package.json b/package.json index aa4c94ef..7ebd05c9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "litten", "description": "Finding new friends for furry friends", - "version": "1.1.0", + "version": "1.2.0-rc.2", "private": true, "main": "./index.js", "directories": { From a64da8f740c7bc78632aa49e287d73dadc52c043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Carmo?= <17721880+joaocarmo@users.noreply.github.com> Date: Sun, 20 Feb 2022 22:23:21 +0000 Subject: [PATCH 4/4] :green_heart: Should fix the workflow to publish to the play store (#36) (#37) --- .github/workflows/publish-play-store.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-play-store.yml b/.github/workflows/publish-play-store.yml index da0ac2e6..1e41daa8 100644 --- a/.github/workflows/publish-play-store.yml +++ b/.github/workflows/publish-play-store.yml @@ -9,6 +9,10 @@ on: description: 'The track in which you want to assign the uploaded app. Default: internal. Possible: alpha, beta, internal, production.' required: false default: 'internal' + status: + description: 'Release status. This can be set to draft to complete the release at some other time. Default: completed. Possible: completed, inProgress, draft, halted.' + required: false + default: 'completed' env: GOOGLE_SERVICES_PATH: android/app/google-services.json @@ -94,5 +98,6 @@ jobs: serviceAccountJson: ${{ env.SERVICE_ACCOUNT_PATH }} packageName: com.litten releaseFiles: ${{ env.OUTPUT_PATH }} - track: ${{ github.event.inputs.track }} whatsNewDirectory: ${{ env.WHATS_NEW_PATH }} + track: ${{ github.event.inputs.track }} + status: ${{ github.event.inputs.status }}