From cbdfd6a8a15e2dd36fdb0a08c4d849c10d672951 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Fri, 16 Apr 2021 12:06:51 -0400 Subject: [PATCH 01/23] scriptsworking --- bitrise.yml | 2 +- scripts/bump_version.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100755 scripts/bump_version.sh diff --git a/bitrise.yml b/bitrise.yml index fea02f4a473..b268943467d 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -323,4 +323,4 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: "'2.1.1'" \ No newline at end of file + VERSION_NAME: 2.1.3 \ No newline at end of file diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh new file mode 100755 index 00000000000..cc01e4063e2 --- /dev/null +++ b/scripts/bump_version.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +set -e +set -u +set -o pipefail + +versionName="$(awk '/VERSION_NAME: /{print $2}' bitrise.yml)" + +MAJOR=$(awk -F. '{print $1}' <<< $versionName) +MINOR=$(awk -F. '{print $2}' <<< $versionName) +PATCH=$(awk -F. '{print $3}' <<< $versionName) + +RELEASE_TYPE=$1 + +if [ "$1" == "major" ] ; then + major=$(($MAJOR + 1)); + minor="0"; + patch="0"; + version=$major'.'$minor'.'$patch +elif [ "$1" == "minor" ] ; then + minor=$(($MINOR + 1)); + patch="0"; + version=$MAJOR'.'$minor'.'$patch +elif [ "$1" == "patch" ] ; then + patch=$(($PATCH + 1)); + version=$MAJOR'.'$MINOR'.'$patch +fi + +echo $version \ No newline at end of file From 8ee216fd582f2c73ebe6d5f1885540487b9b511c Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Fri, 16 Apr 2021 12:22:05 -0400 Subject: [PATCH 02/23] scripts --- bitrise.yml | 2 +- scripts/bump_version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index b268943467d..bc14190bc71 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -323,4 +323,4 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: 2.1.3 \ No newline at end of file + VERSION_NAME: 3.7.0 \ No newline at end of file diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh index cc01e4063e2..697df7de26d 100755 --- a/scripts/bump_version.sh +++ b/scripts/bump_version.sh @@ -25,5 +25,5 @@ elif [ "$1" == "patch" ] ; then patch=$(($PATCH + 1)); version=$MAJOR'.'$MINOR'.'$patch fi - +sed -i '' -e "s/VERSION_NAME: [0-9].[0-9].[0-9]/VERSION_NAME: $version/" bitrise.yml echo $version \ No newline at end of file From f8908aa337bfb99245f3b2df68718d32e708b1a7 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Fri, 16 Apr 2021 12:30:32 -0400 Subject: [PATCH 03/23] scripts --- bitrise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitrise.yml b/bitrise.yml index bc14190bc71..41be5fc521a 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -323,4 +323,4 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: 3.7.0 \ No newline at end of file + VERSION_NAME: 3.7.1 \ No newline at end of file From 2768df112ae1302c1a6ea1b5e7ea31d3e13b8949 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Fri, 16 Apr 2021 13:50:15 -0400 Subject: [PATCH 04/23] working --- bitrise.yml | 2 +- scripts/bump_version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 41be5fc521a..3b559f343d1 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -323,4 +323,4 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: 3.7.1 \ No newline at end of file + VERSION_NAME: 4.0.0 \ No newline at end of file diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh index 697df7de26d..171a7e56c03 100755 --- a/scripts/bump_version.sh +++ b/scripts/bump_version.sh @@ -25,5 +25,5 @@ elif [ "$1" == "patch" ] ; then patch=$(($PATCH + 1)); version=$MAJOR'.'$MINOR'.'$patch fi -sed -i '' -e "s/VERSION_NAME: [0-9].[0-9].[0-9]/VERSION_NAME: $version/" bitrise.yml +sed -i '' -e 's/VERSION_NAME: [0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}/VERSION_NAME: '$version'/' bitrise.yml echo $version \ No newline at end of file From c9ad43b385e768152e3bd757cb8ed5120638b9a5 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Mon, 19 Apr 2021 12:23:10 -0400 Subject: [PATCH 05/23] newscript --- bitrise.yml | 2 +- scripts/bump_version.sh | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 3b559f343d1..a41e5646589 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -323,4 +323,4 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: 4.0.0 \ No newline at end of file + VERSION_NAME: 6.0.0 \ No newline at end of file diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh index 171a7e56c03..c77c1a79ffd 100755 --- a/scripts/bump_version.sh +++ b/scripts/bump_version.sh @@ -1,29 +1,28 @@ #!/usr/bin/env bash -set -e -set -u -set -o pipefail - versionName="$(awk '/VERSION_NAME: /{print $2}' bitrise.yml)" MAJOR=$(awk -F. '{print $1}' <<< $versionName) MINOR=$(awk -F. '{print $2}' <<< $versionName) PATCH=$(awk -F. '{print $3}' <<< $versionName) -RELEASE_TYPE=$1 +branchName=$(git rev-parse --symbolic --abbrev-ref HEAD) -if [ "$1" == "major" ] ; then +if [ $branchName == "--major" ] ; then major=$(($MAJOR + 1)); minor="0"; patch="0"; version=$major'.'$minor'.'$patch -elif [ "$1" == "minor" ] ; then +elif [ $branchName == "--minor" ] ; then minor=$(($MINOR + 1)); patch="0"; version=$MAJOR'.'$minor'.'$patch -elif [ "$1" == "patch" ] ; then +elif [ $branchName == "--patch" ] ; then patch=$(($PATCH + 1)); version=$MAJOR'.'$MINOR'.'$patch +else + version=$MAJOR'.'$MINOR'.'$PATCH fi sed -i '' -e 's/VERSION_NAME: [0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}/VERSION_NAME: '$version'/' bitrise.yml -echo $version \ No newline at end of file +echo $version +echo $branchName From ace8c66e4a739265d9bd08e4d0b230df749d815c Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Mon, 19 Apr 2021 14:41:51 -0400 Subject: [PATCH 06/23] works --- bitrise.yml | 2 +- scripts/bump_version.sh | 38 ++++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index a41e5646589..7d319662afe 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -323,4 +323,4 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: 6.0.0 \ No newline at end of file + VERSION_NAME: 1.0.7 \ No newline at end of file diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh index c77c1a79ffd..e61b45a666d 100755 --- a/scripts/bump_version.sh +++ b/scripts/bump_version.sh @@ -1,27 +1,33 @@ #!/usr/bin/env bash +set -e +set -u +set -o pipefail + versionName="$(awk '/VERSION_NAME: /{print $2}' bitrise.yml)" MAJOR=$(awk -F. '{print $1}' <<< $versionName) MINOR=$(awk -F. '{print $2}' <<< $versionName) PATCH=$(awk -F. '{print $3}' <<< $versionName) +version='a' +# branchName=$(git rev-parse --symbolic --abbrev-ref HEAD) +branchName='release/aaa-patch' +version=$MAJOR'.'$MINOR'.'$PATCH -branchName=$(git rev-parse --symbolic --abbrev-ref HEAD) - -if [ $branchName == "--major" ] ; then - major=$(($MAJOR + 1)); - minor="0"; - patch="0"; - version=$major'.'$minor'.'$patch -elif [ $branchName == "--minor" ] ; then - minor=$(($MINOR + 1)); - patch="0"; - version=$MAJOR'.'$minor'.'$patch -elif [ $branchName == "--patch" ] ; then - patch=$(($PATCH + 1)); - version=$MAJOR'.'$MINOR'.'$patch -else - version=$MAJOR'.'$MINOR'.'$PATCH +if [[ $branchName == *"release/"* ]] ; then + if [[ $branchName == *"-major"* ]] ; then + major=$(($MAJOR + 1)); + minor="0"; + patch="0"; + version=$major'.'$minor'.'$patch + elif [[ $branchName == *"-minor"* ]] ; then + minor=$(($MINOR + 1)); + patch="0"; + version=$MAJOR'.'$minor'.'$patch + elif [[ $branchName == *"-patch"* ]] ; then + patch=$(($PATCH + 1)); + version=$MAJOR'.'$MINOR'.'$patch + fi fi sed -i '' -e 's/VERSION_NAME: [0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}/VERSION_NAME: '$version'/' bitrise.yml echo $version From a23c9efbef68f61edb2f49e6d27f05ee787e0a45 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 21 Apr 2021 15:30:31 -0400 Subject: [PATCH 07/23] pre-merge-hook --- package.json | 3 ++- scripts/{bump_version.sh => bump-version.sh} | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) rename scripts/{bump_version.sh => bump-version.sh} (91%) diff --git a/package.json b/package.json index 0a70ee7062f..ec54e76b38f 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,8 @@ }, "husky": { "hooks": { - "pre-commit": "lint-staged" + "pre-commit": "lint-staged", + "pre-merge-commit": "yarn ./scripts/bump-version.sh" } }, "lint-staged": { diff --git a/scripts/bump_version.sh b/scripts/bump-version.sh similarity index 91% rename from scripts/bump_version.sh rename to scripts/bump-version.sh index e61b45a666d..712d67df4f0 100755 --- a/scripts/bump_version.sh +++ b/scripts/bump-version.sh @@ -10,8 +10,8 @@ MAJOR=$(awk -F. '{print $1}' <<< $versionName) MINOR=$(awk -F. '{print $2}' <<< $versionName) PATCH=$(awk -F. '{print $3}' <<< $versionName) version='a' -# branchName=$(git rev-parse --symbolic --abbrev-ref HEAD) -branchName='release/aaa-patch' +branchName=$(git rev-parse --symbolic --abbrev-ref HEAD) +# branchName='release/aaa-patch' version=$MAJOR'.'$MINOR'.'$PATCH if [[ $branchName == *"release/"* ]] ; then From e8302b0ab6c57e87087b7795653df9cd6a077bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20Mi=C3=B1o?= Date: Wed, 21 Apr 2021 15:33:32 -0400 Subject: [PATCH 08/23] 1.0.0 (#2560) --- bitrise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitrise.yml b/bitrise.yml index 7d319662afe..507d6fe055a 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -323,4 +323,4 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: 1.0.7 \ No newline at end of file + VERSION_NAME: 1.0.0 \ No newline at end of file From c044e760c26879857725d0a7361279074eaf6152 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 21 Apr 2021 15:35:32 -0400 Subject: [PATCH 09/23] dah --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index ec54e76b38f..0a70ee7062f 100644 --- a/package.json +++ b/package.json @@ -52,8 +52,7 @@ }, "husky": { "hooks": { - "pre-commit": "lint-staged", - "pre-merge-commit": "yarn ./scripts/bump-version.sh" + "pre-commit": "lint-staged" } }, "lint-staged": { From 78ff88e61e02bdd9bc6d357bc114dc7ceb49777b Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 21 Apr 2021 16:06:24 -0400 Subject: [PATCH 10/23] actions? --- .github/workflows/bump-version-name.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/bump-version-name.yml diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml new file mode 100644 index 00000000000..52d40438c52 --- /dev/null +++ b/.github/workflows/bump-version-name.yml @@ -0,0 +1,11 @@ +name: Bump version name +on: + push: + branches: + - bitrise-yml-bump-version +jobs: + bump-version-name: + runs-on: ubuntu-latest + steps: + - name: Bump script + uses: yarn ../../scripts/bump-version.sh From 218ce9985898391ffd03c6cb652850c0f13b0896 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 21 Apr 2021 16:11:08 -0400 Subject: [PATCH 11/23] branchasinput --- .github/workflows/bump-version-name.yml | 5 ++++- scripts/bump-version.sh | 13 +++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml index 52d40438c52..679bddd31e7 100644 --- a/.github/workflows/bump-version-name.yml +++ b/.github/workflows/bump-version-name.yml @@ -6,6 +6,9 @@ on: jobs: bump-version-name: runs-on: ubuntu-latest + if: | + github.event.pull_request.merged == true && + startsWith(github.event.pull_request.head.ref, 'release/') steps: - name: Bump script - uses: yarn ../../scripts/bump-version.sh + uses: yarn ../../scripts/bump-version.sh github.event.pull_request.head.ref diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 712d67df4f0..165ad591efa 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -9,26 +9,23 @@ versionName="$(awk '/VERSION_NAME: /{print $2}' bitrise.yml)" MAJOR=$(awk -F. '{print $1}' <<< $versionName) MINOR=$(awk -F. '{print $2}' <<< $versionName) PATCH=$(awk -F. '{print $3}' <<< $versionName) -version='a' -branchName=$(git rev-parse --symbolic --abbrev-ref HEAD) -# branchName='release/aaa-patch' version=$MAJOR'.'$MINOR'.'$PATCH -if [[ $branchName == *"release/"* ]] ; then - if [[ $branchName == *"-major"* ]] ; then +if [[ $1 == *"release/"* ]] ; then + if [[ $1 == *"-major"* ]] ; then major=$(($MAJOR + 1)); minor="0"; patch="0"; version=$major'.'$minor'.'$patch - elif [[ $branchName == *"-minor"* ]] ; then + elif [[ $1 == *"-minor"* ]] ; then minor=$(($MINOR + 1)); patch="0"; version=$MAJOR'.'$minor'.'$patch - elif [[ $branchName == *"-patch"* ]] ; then + elif [[ $1 == *"-patch"* ]] ; then patch=$(($PATCH + 1)); version=$MAJOR'.'$MINOR'.'$patch fi fi sed -i '' -e 's/VERSION_NAME: [0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}/VERSION_NAME: '$version'/' bitrise.yml echo $version -echo $branchName +echo $1 From b1b17753f0f5f235938ab893903c92228189fc25 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 21 Apr 2021 16:13:13 -0400 Subject: [PATCH 12/23] update --- .github/workflows/bump-version-name.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml index 679bddd31e7..7d7cafd36bb 100644 --- a/.github/workflows/bump-version-name.yml +++ b/.github/workflows/bump-version-name.yml @@ -11,4 +11,4 @@ jobs: startsWith(github.event.pull_request.head.ref, 'release/') steps: - name: Bump script - uses: yarn ../../scripts/bump-version.sh github.event.pull_request.head.ref + uses: ../../scripts/bump-version.sh github.event.pull_request.head.ref From 5587388f1e3e992b023328a03e17c5dfc699835f Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 21 Apr 2021 16:39:21 -0400 Subject: [PATCH 13/23] branch --- .github/workflows/bump-version-name.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml index 7d7cafd36bb..f4d6f1635dc 100644 --- a/.github/workflows/bump-version-name.yml +++ b/.github/workflows/bump-version-name.yml @@ -2,7 +2,7 @@ name: Bump version name on: push: branches: - - bitrise-yml-bump-version + - develop jobs: bump-version-name: runs-on: ubuntu-latest From 27695bfe3abca5a7882f10855a2873cc4da612f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20Mi=C3=B1o?= Date: Wed, 21 Apr 2021 20:38:36 -0400 Subject: [PATCH 14/23] Release/testing minor (#2563) * Bitrise yml bump version (#1) * added new bitrise yml file * updated unit test yml * updated yml * added code coverage * added code coverage install * segment out code setup and validation from test cases * updating yml audit * updated yml * updated yml * updated yml audits * updated yml audits * updated yml audits * updated yml audits * updated yml install * updated yml audit * updated yml audit * updated yml segmented code_setup * updated yml segmented code_setup * updated yml segmented set to not always run * updated yml segmented code cov * updated yml triggers * updated yml triggers * updated yml triggers * updated yml codecov * switched to ci * switched to ci * test deploy * test deploy ios * format * imported env variables * added env variables * added env variables * reconfigured build triggers * reconfigured build triggers * reconfigured build triggers * removed fastlane from build scripts and added commnets to bitrise scripts * testing android artifact upload * commented out code that is not needed * added android deploy paths * test * Revert "test" This reverts commit 77ef2822f0d7f58a70cf47d6e24a8ac7a9b2404d. * updated android deploy paths * bitrise-yml-bump-version * bump_version_minor * workflow * PROJECT_LOCATION * bump_version_minor * new_version_name * space * Revert "space" This reverts commit e0eb5ad1a7673c01e6f2bd891ee3b2c141c52d85. * 2.1.1 * new_version_name * torevert * Revert "torevert" This reverts commit a315582657ace308e3fe94f399c0c6e25ef53ec4. * d * revert * env * ios * test android build * bump_version_minor * temporarily creating debug android build for testing * VERSION_NAME * scriptsworking * scripts * scripts * working * newscript * works * pre-merge-hook * 1.0.0 (#2560) * dah * actions? * branchasinput * update * branch Co-authored-by: sethkfman * changename (#2) * Changetorun (#3) * changename * run * release/test-minor (#4) * rm-condition (#5) * Filelocation (#6) * rm-condition * file * Checkout step (#7) * rm-condition * file * checkout-step * Try (#8) * a * Revert "a" This reverts commit 5df3682b72954f3698d2cc8dd981de109f0f6746. * Logs (#9) * a * Revert "a" This reverts commit 5df3682b72954f3698d2cc8dd981de109f0f6746. * logs * Branch (#10) * a * Revert "a" This reverts commit 5df3682b72954f3698d2cc8dd981de109f0f6746. * logs * branch * Var (#11) * a * Revert "a" This reverts commit 5df3682b72954f3698d2cc8dd981de109f0f6746. * logs * branch * correct * echo (#12) * echo * rm * pull-request (#13) * Pull request 2 (#14) * pull-request * ref * GITHUB_REF * parse * with-branch (#15) * Origin branch (#16) * with-branch * origin-branch * base_ref (#17) * push * rmrnv * gh * action * event_name * base_ref * location * location * ls * find * file * file * GITHUB_TOKEN * persist * with * uses * bitrise * sed * commit * diff * release/fake-major * add-and-commit * with * author * path-to-th-repo * checkout@v1 * v2 * Bump version name * useref (#18) * change * ref * something (#19) * Branch 3 (#20) * something * onmerge * fix * Branch 4 (#21) * something * onmerge * fix * GITHUB_REF * GITHUB_CONTEXT * GITHUB_CONTEXT * BASE_REF * HEAD_REF * nobump * something (#22) * s (#23) * s * Bump version name * types (#24) * create-pr * something (#25) * Release/ww patch (#26) * something * opened * Bump version name * othercommit * Release/nohead patch (#36) * ghactions * something * fix * nopush * head * pull * nohead * nopull * nohead * update * gitpush * force * Bump version name * opened Co-authored-by: github-actions * rmonpush * Bump version name * startsWith * main * rmstartwith * line Co-authored-by: sethkfman Co-authored-by: github-actions --- .github/workflows/bump-version-name.yml | 26 +++++++++++++++++++------ bitrise.yml | 2 +- scripts/bump-version.sh | 6 +++++- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml index 7d7cafd36bb..dbbdb1f586a 100644 --- a/.github/workflows/bump-version-name.yml +++ b/.github/workflows/bump-version-name.yml @@ -1,14 +1,28 @@ name: Bump version name on: - push: + # push: + # branches: + # - develop + pull_request: branches: - - bitrise-yml-bump-version + - develop + - main + types: [opened] jobs: bump-version-name: runs-on: ubuntu-latest - if: | - github.event.pull_request.merged == true && - startsWith(github.event.pull_request.head.ref, 'release/') steps: + - uses: actions/checkout@v2 - name: Bump script - uses: ../../scripts/bump-version.sh github.event.pull_request.head.ref + env: + GITHUB_CONTEXT: ${{ toJSON(github) }} + BASE_REF: ${{ github.base_ref }} + HEAD_REF: ${{ github.head_ref }} + run: | + ./scripts/bump-version.sh "$HEAD_REF" + git diff + git config user.name github-actions + git config user.email github-actions@github.com + git add . + git commit -m "Bump version name" + git push origin HEAD:"$HEAD_REF" --force diff --git a/bitrise.yml b/bitrise.yml index 507d6fe055a..df5c0f9c994 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -323,4 +323,4 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: 1.0.0 \ No newline at end of file + VERSION_NAME: 1.0.0 diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 165ad591efa..fa5e8e8f82b 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -26,6 +26,10 @@ if [[ $1 == *"release/"* ]] ; then version=$MAJOR'.'$MINOR'.'$patch fi fi -sed -i '' -e 's/VERSION_NAME: [0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}/VERSION_NAME: '$version'/' bitrise.yml + +echo 'GOT THE VERSION' echo $version +echo "BRANCH" echo $1 + +sed -i -e 's/VERSION_NAME: [0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}/VERSION_NAME: '$version'/' bitrise.yml From 6d8f93f8513a5a6b33f1387dd8cbc5b19f3edd21 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 22 Apr 2021 14:08:40 -0400 Subject: [PATCH 15/23] newscript --- scripts/bump-version.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index fa5e8e8f82b..6bfd94dfde9 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -27,9 +27,10 @@ if [[ $1 == *"release/"* ]] ; then fi fi -echo 'GOT THE VERSION' +echo "Bumping versionName to" echo $version -echo "BRANCH" -echo $1 sed -i -e 's/VERSION_NAME: [0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}/VERSION_NAME: '$version'/' bitrise.yml +sed -i -e 's/"version": "[0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}"/"version": "'$version'"/' package.json + +echo "Bumping versionName finished" From 1e8bab15961865e475afc83b24a7ec0260db89e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20Mi=C3=B1o?= Date: Thu, 22 Apr 2021 14:34:52 -0400 Subject: [PATCH 16/23] release/testbump-patch (#2570) * space * branch * notopenend * diff * Bump version name Co-authored-by: github-actions --- .github/workflows/bump-version-name.yml | 3 ++- bitrise.yml | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml index d3f41beda4f..ae086f74326 100644 --- a/.github/workflows/bump-version-name.yml +++ b/.github/workflows/bump-version-name.yml @@ -6,8 +6,9 @@ on: pull_request: branches: - develop + - bitrise-yml-bump-version # - main - types: [opened] + # types: [opened] jobs: bump-version-name: runs-on: ubuntu-latest diff --git a/bitrise.yml b/bitrise.yml index df5c0f9c994..3fc405b70c0 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -323,4 +323,4 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: 1.0.0 + VERSION_NAME: 1.0.1 diff --git a/package.json b/package.json index c1f7b285edb..2d81a3a2595 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask", - "version": "2.2.0", + "version": "1.0.1", "private": true, "scripts": { "watch": "./scripts/build.sh watcher watch", From fed117524501c333860da48a5b773795f200a061 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 22 Apr 2021 16:01:54 -0400 Subject: [PATCH 17/23] addbranch --- .github/workflows/bump-version-name.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml index ae086f74326..149ce028224 100644 --- a/.github/workflows/bump-version-name.yml +++ b/.github/workflows/bump-version-name.yml @@ -6,8 +6,8 @@ on: pull_request: branches: - develop - - bitrise-yml-bump-version - # - main + - main + - bitrise_yml_new # types: [opened] jobs: bump-version-name: From 7ad2aafa423a848f5e4a8ebedea102d97c9afcb6 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 22 Apr 2021 16:03:17 -0400 Subject: [PATCH 18/23] version --- .github/workflows/bump-version-name.yml | 2 +- bitrise.yml | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml index 149ce028224..3824216c717 100644 --- a/.github/workflows/bump-version-name.yml +++ b/.github/workflows/bump-version-name.yml @@ -8,7 +8,7 @@ on: - develop - main - bitrise_yml_new - # types: [opened] + types: [opened] jobs: bump-version-name: runs-on: ubuntu-latest diff --git a/bitrise.yml b/bitrise.yml index 3fc405b70c0..edbdd7e1f3a 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -323,4 +323,4 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: 1.0.1 + VERSION_NAME: 2.2.0 diff --git a/package.json b/package.json index 2d81a3a2595..c1f7b285edb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask", - "version": "1.0.1", + "version": "2.2.0", "private": true, "scripts": { "watch": "./scripts/build.sh watcher watch", From 8861246ec3ecea6842df249b2263657b30318d55 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 22 Apr 2021 16:20:33 -0400 Subject: [PATCH 19/23] ifrelease --- scripts/bump-version.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 6bfd94dfde9..29ae5829e94 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -25,12 +25,12 @@ if [[ $1 == *"release/"* ]] ; then patch=$(($PATCH + 1)); version=$MAJOR'.'$MINOR'.'$patch fi -fi -echo "Bumping versionName to" -echo $version + echo "Bumping versionName to" + echo $version -sed -i -e 's/VERSION_NAME: [0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}/VERSION_NAME: '$version'/' bitrise.yml -sed -i -e 's/"version": "[0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}"/"version": "'$version'"/' package.json + sed -i -e 's/VERSION_NAME: [0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}/VERSION_NAME: '$version'/' bitrise.yml + sed -i -e 's/"version": "[0-9]\{1,\}.[0-9]\{1,\}.[0-9]\{1,\}"/"version": "'$version'"/' package.json -echo "Bumping versionName finished" + echo "Bumping versionName finished" +fi From 3e845b5828f1bf6053fe783bb0621c87b1a3a39e Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 22 Apr 2021 16:21:20 -0400 Subject: [PATCH 20/23] add --- .github/workflows/bump-version-name.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml index 3824216c717..ef26194f088 100644 --- a/.github/workflows/bump-version-name.yml +++ b/.github/workflows/bump-version-name.yml @@ -24,6 +24,7 @@ jobs: git diff git config user.name github-actions git config user.email github-actions@github.com - git add . + git add bitrise.yml + git add package.json git commit -m "Bump version name" git push origin HEAD:"$HEAD_REF" --force From 3ebfa6247bbed542c20882e5c86dbe52fb65d706 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 22 Apr 2021 16:21:45 -0400 Subject: [PATCH 21/23] lasttest --- .github/workflows/bump-version-name.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml index ef26194f088..cb834bad5e0 100644 --- a/.github/workflows/bump-version-name.yml +++ b/.github/workflows/bump-version-name.yml @@ -8,7 +8,8 @@ on: - develop - main - bitrise_yml_new - types: [opened] + - bitrise-yml-bump-version + # types: [opened] jobs: bump-version-name: runs-on: ubuntu-latest From fd8d0056ee10585a12175a7a065a7c9798bbd00b Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 22 Apr 2021 16:26:19 -0400 Subject: [PATCH 22/23] ifcontains --- .github/workflows/bump-version-name.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml index cb834bad5e0..531b179711f 100644 --- a/.github/workflows/bump-version-name.yml +++ b/.github/workflows/bump-version-name.yml @@ -13,12 +13,11 @@ on: jobs: bump-version-name: runs-on: ubuntu-latest + if: contains(github.head_ref, "release/") steps: - uses: actions/checkout@v2 - name: Bump script env: - GITHUB_CONTEXT: ${{ toJSON(github) }} - BASE_REF: ${{ github.base_ref }} HEAD_REF: ${{ github.head_ref }} run: | ./scripts/bump-version.sh "$HEAD_REF" From 565b1e04d97dd8ecaa4ba7c777d5ad15a850f5a2 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 22 Apr 2021 16:27:03 -0400 Subject: [PATCH 23/23] branch --- .github/workflows/bump-version-name.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml index 531b179711f..8d7d106db8b 100644 --- a/.github/workflows/bump-version-name.yml +++ b/.github/workflows/bump-version-name.yml @@ -8,8 +8,7 @@ on: - develop - main - bitrise_yml_new - - bitrise-yml-bump-version - # types: [opened] + types: [opened] jobs: bump-version-name: runs-on: ubuntu-latest