From 487f0f64275179ed90b7a068abcdd7aec64a7c54 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 20:27:47 +0300 Subject: [PATCH 01/13] test bump version --- src/actions.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/actions.js b/src/actions.js index ce56733..d77c653 100644 --- a/src/actions.js +++ b/src/actions.js @@ -100,7 +100,6 @@ const run = async () => { } catch (error) { console.log("error", error?.message); } - // update PR try { const options = { From 53a60ad13fe7e8ed7ee51d3122e332505ad330d4 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 20:37:40 +0300 Subject: [PATCH 02/13] add git pull before bumping version --- .github/workflows/bumpversion.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index 7c413ce..925ea4f 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -12,6 +12,8 @@ jobs: - uses: actions/checkout@v2 with: ref: develop + - name: pull latest develop branch changes + run: git pull # push changes to develop - name: set global attributes From 1f0f024c9d27b40ea72103dff3cbf9589d600272 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 20:43:35 +0300 Subject: [PATCH 03/13] test bump version --- .github/workflows/bumpversion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index 925ea4f..f9cd120 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -8,9 +8,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - uses: actions/checkout@v2 with: + token: ${{ secrets.TOKEN }} ref: develop - name: pull latest develop branch changes run: git pull From d4fda60fe03f7a8efb8918f894b6b04791460805 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 20:47:27 +0300 Subject: [PATCH 04/13] test bump version --- .github/workflows/bumpversion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index f9cd120..800038c 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2 with: token: ${{ secrets.TOKEN }} - ref: develop + ref: origin/feat/develop - name: pull latest develop branch changes run: git pull From f1793f3552c212c39a20a34b8e3a750a00d3ce08 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 20:51:05 +0300 Subject: [PATCH 05/13] test bump version --- .github/workflows/bumpversion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index 800038c..9e5c551 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2 with: token: ${{ secrets.TOKEN }} - ref: origin/feat/develop + ref: origin/develop - name: pull latest develop branch changes run: git pull From 2d16527ca950f49b2b55e4cd43e437e96ff8e9ad Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 20:54:36 +0300 Subject: [PATCH 06/13] test bump version --- .github/workflows/bumpversion.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index 9e5c551..c8f7b2b 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -9,9 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + run: git pull origin develop with: token: ${{ secrets.TOKEN }} - ref: origin/develop + ref: 'develop' - name: pull latest develop branch changes run: git pull From a0197ec02659ccca2233af555586b8543f4578e7 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 20:57:41 +0300 Subject: [PATCH 07/13] test bump version --- .github/workflows/bumpversion.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index c8f7b2b..dbf6af9 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - run: git pull origin develop + - run: git pull origin develop with: token: ${{ secrets.TOKEN }} - ref: 'develop' + ref: develop - name: pull latest develop branch changes run: git pull From e670bbdf85667557164b1994f053f8e6873afec8 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 21:01:46 +0300 Subject: [PATCH 08/13] test bump version --- .github/workflows/bumpversion.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index dbf6af9..0463fec 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -9,12 +9,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: git pull origin develop with: token: ${{ secrets.TOKEN }} ref: develop - name: pull latest develop branch changes - run: git pull + run: git pull origin develop # push changes to develop - name: set global attributes From 1213ad3f15f0fc439d13f28e915dfc722cb76fee Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 21:29:53 +0300 Subject: [PATCH 09/13] test bump version --- .github/workflows/bumpversion.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index 0463fec..f9e51d8 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -15,7 +15,6 @@ jobs: - name: pull latest develop branch changes run: git pull origin develop - # push changes to develop - name: set global attributes run: | git config --global user.email "bmsteve96@gmail.com" From 8637dec33be51d4ed2d0158d7e488eae98d5cd45 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 21:36:23 +0300 Subject: [PATCH 10/13] try new implementation to checkout to develop --- .github/workflows/bumpversion.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index f9e51d8..dc799f3 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -11,7 +11,12 @@ jobs: - uses: actions/checkout@v2 with: token: ${{ secrets.TOKEN }} - ref: develop + # ref: develop + - name: fetch all branches + run: | + git fetch --all + get checkout origin develop + - name: pull latest develop branch changes run: git pull origin develop From b8575f8cbb1f0a08a703198a5794a809b3d5256d Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 21:39:22 +0300 Subject: [PATCH 11/13] fix typo --- .github/workflows/bumpversion.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index dc799f3..150bca9 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -15,8 +15,8 @@ jobs: - name: fetch all branches run: | git fetch --all - get checkout origin develop - + git checkout origin develop + - name: pull latest develop branch changes run: git pull origin develop From 0df4d3f8e93189b672ddb112439f3690a01c5b3f Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 21:41:06 +0300 Subject: [PATCH 12/13] fix typo --- .github/workflows/bumpversion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index 150bca9..3bf6c61 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -15,7 +15,7 @@ jobs: - name: fetch all branches run: | git fetch --all - git checkout origin develop + git checkout develop - name: pull latest develop branch changes run: git pull origin develop From 8c11e9d1ffda918b5c03b2d4f1c7a6d45666f76f Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 21:45:16 +0300 Subject: [PATCH 13/13] new test --- .github/workflows/bumpversion.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index 3bf6c61..80ee300 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -14,8 +14,7 @@ jobs: # ref: develop - name: fetch all branches run: | - git fetch --all - git checkout develop + - name: pull latest develop branch changes run: git pull origin develop @@ -26,10 +25,17 @@ jobs: git config --global user.name "Benedict Steven" git remote set-url origin https://x-access-token:${{ secrets.TOKEN }}@github.com/${{ github.repository }} - name: Build - run: npm install + run: | + git fetch --all + git checkout develop + npm install + - name: Build - run: npm run build + run: | + git fetch --all + git checkout develop + npm run build - name: bump version actions uses: bmsteven/bump-version@1.0.3