From 7a85cd1434473f0cc062e4b1f5f4254f59feadbd Mon Sep 17 00:00:00 2001 From: Yehuda Cohen Date: Tue, 22 Dec 2020 17:18:33 +0200 Subject: [PATCH 1/5] fix: get some (#59) * fix: some * fix: some 2 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 29a301e..c7639a3 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,5 @@ 2 3 4 +5 +6 From 3a236866fa8bfc9ddc72f1e6330466b8f8c883d6 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 22 Dec 2020 15:19:16 +0000 Subject: [PATCH 2/5] chore(release): 1.0.7-beta.1 ## [1.0.7-beta.1](https://github.com/cohen72/git-playground/compare/v1.0.6...v1.0.7-beta.1) (2020-12-22) ### Bug Fixes * get some ([#59](https://github.com/cohen72/git-playground/issues/59)) ([7a85cd1](https://github.com/cohen72/git-playground/commit/7a85cd1434473f0cc062e4b1f5f4254f59feadbd)) --- android/app/build.gradle | 4 ++-- ios/ColuConsumerRn/Info.plist | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 66bc551..68107d6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -148,8 +148,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion missingDimensionStrategy "RNN.reactNativeVersion", "reactNative60" // See note below! - versionCode 134 - versionName "1.0.6" + versionCode 135 + versionName "1.0.7-beta.1" multiDexEnabled true resValue "string", "build_config_package", "com.colu.newcities" } diff --git a/ios/ColuConsumerRn/Info.plist b/ios/ColuConsumerRn/Info.plist index 3a31534..4a6a71c 100755 --- a/ios/ColuConsumerRn/Info.plist +++ b/ios/ColuConsumerRn/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.6 + 1.0.7 CFBundleSignature ???? CFBundleURLTypes @@ -40,7 +40,7 @@ CFBundleVersion - 134 + 135 FacebookAppID 800294393431311 FacebookDisplayName diff --git a/package.json b/package.json index 5b8dcb7..82c57a2 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "git-playground", - "version": "1.0.6", + "version": "1.0.7-beta.1", "private": true, "scripts": { "postversion": "react-native-version --never-amend" From f407a911cd5b52c630f08e6ad2d5546e1e5228c6 Mon Sep 17 00:00:00 2001 From: Yehuda Cohen Date: Tue, 22 Dec 2020 17:23:11 +0200 Subject: [PATCH 3/5] add develop to release branches --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53e8dce..a21e1c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,8 +4,7 @@ on: push: branches: - master - - beta - - next + - develop jobs: release: From ccaa15f733a0aa7e0a558e5cdc394fc959dcbd01 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 22 Dec 2020 15:24:12 +0000 Subject: [PATCH 4/5] chore(release): 1.0.7-qa.1 ## [1.0.7-qa.1](https://github.com/cohen72/git-playground/compare/v1.0.6...v1.0.7-qa.1) (2020-12-22) ### Bug Fixes * get some ([#59](https://github.com/cohen72/git-playground/issues/59)) ([7a85cd1](https://github.com/cohen72/git-playground/commit/7a85cd1434473f0cc062e4b1f5f4254f59feadbd)) --- android/app/build.gradle | 4 ++-- ios/ColuConsumerRn/Info.plist | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 68107d6..da0cc38 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -148,8 +148,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion missingDimensionStrategy "RNN.reactNativeVersion", "reactNative60" // See note below! - versionCode 135 - versionName "1.0.7-beta.1" + versionCode 136 + versionName "1.0.7-qa.1" multiDexEnabled true resValue "string", "build_config_package", "com.colu.newcities" } diff --git a/ios/ColuConsumerRn/Info.plist b/ios/ColuConsumerRn/Info.plist index 4a6a71c..6ff5de4 100755 --- a/ios/ColuConsumerRn/Info.plist +++ b/ios/ColuConsumerRn/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 135 + 136 FacebookAppID 800294393431311 FacebookDisplayName diff --git a/package.json b/package.json index 82c57a2..31a61d8 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "git-playground", - "version": "1.0.7-beta.1", + "version": "1.0.7-qa.1", "private": true, "scripts": { "postversion": "react-native-version --never-amend" From f03a03248e6221802947b39ef399786cf4ffc5ed Mon Sep 17 00:00:00 2001 From: Yehuda Cohen Date: Tue, 22 Dec 2020 17:26:38 +0200 Subject: [PATCH 5/5] release yml changes --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a21e1c6..746fa7c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: release: - name: Release + name: Deploy runs-on: ubuntu-latest steps: - name: Checkout @@ -31,9 +31,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: If on master, merge back to beta + - name: If on master, merge back semantic release commits back to develop if: github.ref == 'refs/heads/master' run: | - git checkout beta + git checkout develop git merge --ff-only master - git push --force --set-upstream origin beta + git push --force --set-upstream origin develop