move steps

pagopa · Jun 11, 2024 · 181410b · 181410b
1 parent 78327a6
commit 181410b
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/.github/workflows/create_openapi_merge.yml b/.github/workflows/create_openapi_merge.yml
@@ -60,34 +60,34 @@ jobs:
         run: npm install --location global openapi-merge-cli
         shell: bash
 
-      - name: Merge OpenAPI and PostProcess External API
-        if: ${{ inputs.external }}
-        run: | 
-            npx openapi-merge-cli --config ./selfcare-external-api-backend/infra/api/ms_external_api/v2/openapi_merge/openapi_merge.json
-            node ./selfcare-external-api-backend/infra/api/openapi_merge/remove_v_and_tags.js  ./selfcare-external-api-backend/infra/api/ms_external_api/v2/openapi_merge/openapi.external.json ./selfcare-external-api-backend/infra/api/ms_external_api/v2/openapi_merge/openapi.external.json
-
       - name: Configure Git
         working-directory: selfcare-external-api-backend
         run: |
             git config --global user.email "selfcare-github@pagopa.it"
             git config --global user.name "selfcare-github-bot"
 
-      - name: Create new branch an commit
+      - name: Create new branch
         id: create_branch
         working-directory: selfcare-external-api-backend
         run: |
           BRANCH_NAME="docs/openapi-update-$(date +%Y%m%d%H%M%S)"
           git checkout -b $BRANCH_NAME
-          git add .
-          git commit -m "Update openapi"
           echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
-            
+
+      - name: Merge OpenAPI and PostProcess External API
+        if: ${{ inputs.external }}
+        run: | 
+            npx openapi-merge-cli --config ./selfcare-external-api-backend/infra/api/ms_external_api/v2/openapi_merge/openapi_merge.json
+            node ./selfcare-external-api-backend/infra/api/openapi_merge/remove_v_and_tags.js  ./selfcare-external-api-backend/infra/api/ms_external_api/v2/openapi_merge/openapi.external.json ./selfcare-external-api-backend/infra/api/ms_external_api/v2/openapi_merge/openapi.external.json
+
       - name: Push changes
         working-directory: selfcare-external-api-backend
         env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-            git push -u origin HEAD
+          git add .
+          git commit -m "Update openapi" || exit 0
+          git push origin HEAD
 
       - name: Create pull request
         uses: peter-evans/create-pull-request@d53f4d71fdd876f4f4b170d05ce7f1a7dd2bef03 #v6.0.5
@@ -97,6 +97,6 @@ jobs:
             branch: ${{ steps.create_branch.outputs.branch_name }}  # The current branch name
             title: "Update openapi using openapi-merge-cli"
             body: "This PR update openapi files generated by openapi-merge tool."
-            base: feature/SELC-5025
+            base: main
             path: selfcare-external-api-backend