From f2e30acd26d35419e72ecb7e8facb1e5340cb37b Mon Sep 17 00:00:00 2001 From: Andrew Lum Date: Mon, 2 May 2022 23:41:33 -0400 Subject: [PATCH 1/2] move npm version bump up earlier --- .github/workflows/bump-native-sdks.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bump-native-sdks.yml b/.github/workflows/bump-native-sdks.yml index 8217750..98cfece 100644 --- a/.github/workflows/bump-native-sdks.yml +++ b/.github/workflows/bump-native-sdks.yml @@ -15,6 +15,10 @@ jobs: # checkout the repo - uses: actions/checkout@v2 + # Update package.json to latest version + - name: Update package.json to latest + run: npm version ${{ github.event.client_payload.release }} + # copy the build.gradle template file to its final destination - name: Copy android/build.gradle template file uses: canastro/copy-action@master @@ -43,10 +47,6 @@ jobs: data: version=${{ github.event.client_payload.release }} path: 'example/android/app/build.gradle' - # Update package.json to latest version - - name: Update package.json to latest - run: npm version ${{ github.event.client_payload.release }} - # open a pull request with the new sdk version - name: Create Pull Request uses: peter-evans/create-pull-request@v3 @@ -64,6 +64,10 @@ jobs: # checkout the repo - uses: actions/checkout@v2 + # Update package.json to latest version + - name: Update package.json to latest + run: npm version ${{ github.event.client_payload.release }} + # copy the podfile template to its final destination - name: Copy ios/Cartfile.resolved template uses: canastro/copy-action@master @@ -92,10 +96,6 @@ jobs: data: version=${{ github.event.client_payload.release }} path: 'CapacitorRadar.podspec' - # Update package.json to latest version - - name: Update package.json to latest - run: npm version ${{ github.event.client_payload.release }} - # open a pull request with the new sdk version - name: Create Pull Request uses: peter-evans/create-pull-request@v3 From dec498729655bd60956e1f433c1cc21eaf9ed5cb Mon Sep 17 00:00:00 2001 From: Andrew Lum Date: Tue, 3 May 2022 00:11:53 -0400 Subject: [PATCH 2/2] add --commit-hooks false and --git-tag-version false to the npm version command --- .github/workflows/bump-native-sdks.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bump-native-sdks.yml b/.github/workflows/bump-native-sdks.yml index 98cfece..59e91ab 100644 --- a/.github/workflows/bump-native-sdks.yml +++ b/.github/workflows/bump-native-sdks.yml @@ -15,10 +15,6 @@ jobs: # checkout the repo - uses: actions/checkout@v2 - # Update package.json to latest version - - name: Update package.json to latest - run: npm version ${{ github.event.client_payload.release }} - # copy the build.gradle template file to its final destination - name: Copy android/build.gradle template file uses: canastro/copy-action@master @@ -47,6 +43,10 @@ jobs: data: version=${{ github.event.client_payload.release }} path: 'example/android/app/build.gradle' + # Update package.json to latest version + - name: Update package.json to latest + run: npm version ${{ github.event.client_payload.release }} --commit-hooks false --git-tag-version false + # open a pull request with the new sdk version - name: Create Pull Request uses: peter-evans/create-pull-request@v3 @@ -64,10 +64,6 @@ jobs: # checkout the repo - uses: actions/checkout@v2 - # Update package.json to latest version - - name: Update package.json to latest - run: npm version ${{ github.event.client_payload.release }} - # copy the podfile template to its final destination - name: Copy ios/Cartfile.resolved template uses: canastro/copy-action@master @@ -96,6 +92,10 @@ jobs: data: version=${{ github.event.client_payload.release }} path: 'CapacitorRadar.podspec' + # Update package.json to latest version + - name: Update package.json to latest + run: npm version ${{ github.event.client_payload.release }} --commit-hooks false --git-tag-version false + # open a pull request with the new sdk version - name: Create Pull Request uses: peter-evans/create-pull-request@v3