chore: fix changelog generation (#1817)

* chore: fix workflows to use the appropraite commit for checkout * chore: fix version target to push changes at the end
rudderlabs · Aug 1, 2024 · 815b9bf · 815b9bf
1 parent 6f120aa
commit 815b9bf
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 18 deletions.
diff --git a/.github/workflows/deploy-npm.yml b/.github/workflows/deploy-npm.yml
@@ -36,6 +36,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ github.sha }}
 
       - name: Get new version number
         run: |

diff --git a/.github/workflows/deploy-sanity-suite.yml b/.github/workflows/deploy-sanity-suite.yml
@@ -59,6 +59,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.sha }}
 
       - name: Configure deployment options
         id: deployment-options

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -24,6 +24,9 @@ on:
         type: string
         required: false
         default: ''
+      use_pr_head_sha:
+        type: string
+        default: 'false'
     secrets:
       AWS_ACCOUNT_ID:
         required: true
@@ -63,8 +66,21 @@ jobs:
           role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_S3_SYNC_ROLE }}
           aws-region: us-east-1
 
+      - name: Determine checkout SHA
+        id: getSHA
+        run: |
+          if ${{ inputs.use_pr_head_sha }} == 'true'; then
+            sha=$(echo ${{ github.event.pull_request.head.sha }})
+          else
+            sha=$(echo ${{ github.sha }})
+          fi
+          echo "Checkout SHA: $sha"
+          echo "SHA=$sha" >> $GITHUB_OUTPUT
+
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.getSHA.outputs.SHA }}
 
       - name: Get new version number
         run: |

diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
@@ -40,6 +40,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ github.sha }}
 
       # In order to make a commit, we need to initialize a user.
       # You may choose to write something less generic here if you want, it doesn't matter functionality wise.

diff --git a/.github/workflows/security-code-quality-and-bundle-size-checks.yml b/.github/workflows/security-code-quality-and-bundle-size-checks.yml
@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup Node
         uses: actions/setup-node@v4
@@ -43,6 +45,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup Node
         uses: actions/setup-node@v4

diff --git a/.github/workflows/unit-tests-and-lint.yml b/.github/workflows/unit-tests-and-lint.yml
@@ -21,6 +21,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup Node
         uses: actions/setup-node@v4

diff --git a/packages/analytics-js-common/project.json b/packages/analytics-js-common/project.json
@@ -44,9 +44,10 @@
       "executor": "@jscutlery/semver:version",
       "options": {
         "baseBranch": "main",
-        "preset": "conventional",
+        "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true
+        "trackDeps": true,
+        "push": true
       }
     },
     "github": {

diff --git a/packages/analytics-js-cookies/project.json b/packages/analytics-js-cookies/project.json
@@ -44,9 +44,10 @@
       "executor": "@jscutlery/semver:version",
       "options": {
         "baseBranch": "main",
-        "preset": "conventional",
+        "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true
+        "trackDeps": true,
+        "push": true
       }
     },
     "github": {

diff --git a/packages/analytics-js-integrations/project.json b/packages/analytics-js-integrations/project.json
@@ -44,9 +44,10 @@
       "executor": "@jscutlery/semver:version",
       "options": {
         "baseBranch": "main",
-        "preset": "conventional",
+        "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true
+        "trackDeps": true,
+        "push": true
       }
     },
     "github": {

diff --git a/packages/analytics-js-plugins/project.json b/packages/analytics-js-plugins/project.json
@@ -44,9 +44,10 @@
       "executor": "@jscutlery/semver:version",
       "options": {
         "baseBranch": "main",
-        "preset": "conventional",
+        "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true
+        "trackDeps": true,
+        "push": true
       }
     },
     "github": {

diff --git a/packages/analytics-js-service-worker/project.json b/packages/analytics-js-service-worker/project.json
@@ -44,9 +44,10 @@
       "executor": "@jscutlery/semver:version",
       "options": {
         "baseBranch": "main",
-        "preset": "conventional",
+        "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true
+        "trackDeps": true,
+        "push": true
       }
     },
     "github": {

diff --git a/packages/analytics-js/project.json b/packages/analytics-js/project.json
@@ -52,9 +52,10 @@
       "executor": "@jscutlery/semver:version",
       "options": {
         "baseBranch": "main",
-        "preset": "conventional",
+        "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true
+        "trackDeps": true,
+        "push": true
       }
     },
     "github": {

diff --git a/packages/analytics-v1.1/project.json b/packages/analytics-v1.1/project.json
@@ -52,9 +52,10 @@
       "executor": "@jscutlery/semver:version",
       "options": {
         "baseBranch": "main",
-        "preset": "conventional",
+        "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true
+        "trackDeps": true,
+        "push": true
       }
     },
     "github": {

diff --git a/packages/loading-scripts/project.json b/packages/loading-scripts/project.json
@@ -44,9 +44,10 @@
       "executor": "@jscutlery/semver:version",
       "options": {
         "baseBranch": "main",
-        "preset": "conventional",
+        "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true
+        "trackDeps": true,
+        "push": true
       }
     },
     "github": {

diff --git a/packages/sanity-suite/project.json b/packages/sanity-suite/project.json
@@ -44,9 +44,10 @@
       "executor": "@jscutlery/semver:version",
       "options": {
         "baseBranch": "main",
-        "preset": "conventional",
+        "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true
+        "trackDeps": true,
+        "push": true
       }
     }
   }