Updated GH workflow, vulnerability fixes

contentstack · Sep 27, 2024 · cff72fa · cff72fa
1 parent 69321aa
commit cff72fa
Show file tree

Hide file tree

Showing 4 changed files with 246 additions and 221 deletions.
diff --git a/.github/workflows/check-branch.yml b/.github/workflows/check-branch.yml
@@ -1,4 +1,4 @@
-name: 'Check Branch'
+name: "Check Branch"
 
 on:
   pull_request:
@@ -8,13 +8,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Comment PR
-        if: github.base_ref == 'master' && github.head_ref != 'next'
+        if: github.base_ref == 'master' && github.head_ref != 'staging'
         uses: thollander/actions-comment-pull-request@v2
         with:
           message: |
-            We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
+            We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
       - name: Check branch
-        if: github.base_ref == 'master' && github.head_ref != 'next'
+        if: github.base_ref == 'master' && github.head_ref != 'staging'
         run: |
-          echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
+          echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
           exit 1
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,5 @@ tap-html.html
 coverage
 .env
 .dccache
-dist/*
+dist/*
+*.log
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,5 @@ tap-html.html @@
     coverage
     .env
     .dccache
-    dist/*
+    dist/*
+    *.log