Update

joselrio · Jan 16, 2024 · ab588a0 · ab588a0
1 parent 7d2cf4f
commit ab588a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -49,7 +49,7 @@ jobs:
 
         if: ${{ github.event.inputs.new-version }}
         steps:
-            # TODO: Remove the setUp git below since it will not be needed once token will be set
+            # TODO
             - name: Configure Git with the GitHub Token
               run: |
                   git config --global user.email "sa_git_uicomponents@outsystems.com"

diff --git a/.github/workflows/test2.yml b/.github/workflows/test2.yml
@@ -35,7 +35,7 @@ jobs:
                   ref: rc${{ github.event.inputs.new-version }}
 
             - name: Merge branch rc${{ github.event.inputs.new-version }} into main
-              uses: everlytic/branch-merge@1.1.2
+              uses: everlytic/branch-merge@1.1.5
               with:
                   github_token: ${{ secrets.GITHUB_TOKEN }}
                   #   github_token: ${{ secrets.PAT }} TODO!
@@ -68,6 +68,13 @@ jobs:
               with:
                   ref: prep-to-deploy
 
+            # TODO
+            - name: Configure Git with the GitHub Token
+              run: |
+                  git config --global user.email "sa_git_uicomponents@outsystems.com"
+                  git config --global user.name "UiComponentsBot"
+                  git config --global credential.helper store
+
             - name: Install project dependencies
               run: npm install