Merge branch 'main' into chore/update-desktop-changelog

hashicorp · Oct 6, 2023 · 65979c6 · 65979c6
2 parents cac6a48 + 7ac7843
commit 65979c6
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 48 deletions.
diff --git a/.github/scripts/merge.sh b/.github/scripts/merge.sh
@@ -52,24 +52,24 @@ if ! errors=$(git merge -m "Merge Boundary UI OSS branch '${BRANCH}' at commit $
     git checkout "${OSS_BRANCH}"
     git checkout -b "${OSS_LOCAL_BRANCH}"
     git push -f --set-upstream origin "${OSS_LOCAL_BRANCH}"
-    hub pull-request \
+    gh pr create \
       --draft \
-      --no-edit \
-      --labels "oss-merge" \
-      -b "${BASE_BRANCH}" \
-      -h "${OSS_LOCAL_BRANCH}" \
+      --fill-first \
+      --label "oss-merge" \
+      -B "${BASE_BRANCH}" \
+      -H "${OSS_LOCAL_BRANCH}" \
       -a "${ACTOR}" \
-      -m "[${BASE_BRANCH/oss\/release\//}] OSS to ENT merge of (${SHA::7})" \
-      -m "${BASE_BRANCH/oss\//} upstream merge of (${SHA::7})" \
-      -m "Merge failed, Please fix the conflicts using github UI or using the following commands:" \
-      -m "\`\`\`bash" \
-      -m "git checkout ${BASE_BRANCH}" \
-      -m "git pull" \
-      -m "git checkout ${OSS_LOCAL_BRANCH}" \
-      -m "git merge ${BASE_BRANCH}" \
-      -m "# fix conflicts and commit" \
-      -m "git push origin ${OSS_LOCAL_BRANCH}" \
-      -m "\`\`\`"
+      -t "[${BASE_BRANCH/oss\/release\//}] OSS to ENT merge of (${SHA::7})" \
+      -b "${BASE_BRANCH/oss\//} upstream merge of (${SHA::7})
+      Merge failed, Please fix the conflicts using github UI or using the following commands:
+      \`\`\`bash
+      git checkout ${BASE_BRANCH}
+      git pull
+      git checkout ${OSS_LOCAL_BRANCH}
+      git merge ${BASE_BRANCH}
+      # fix conflicts and commit
+      git push origin ${OSS_LOCAL_BRANCH}
+      \`\`\`"
     exit 0
   fi
 fi
@@ -81,14 +81,14 @@ if (git diff ${BRANCH} --exit-code > /dev/null); then
   exit 0
 fi
 git push origin "${git_merge_branch}"
-hub pull-request \
-  --no-edit \
-  --labels "oss-merge" \
-  -b "${BASE_BRANCH}" \
-  -h "${MERGE_BRANCH}" \
+gh pr create \
+  --fill-first \
+  --label "oss-merge" \
+  -B "${BASE_BRANCH}" \
+  -H "${MERGE_BRANCH}" \
   -a ${ACTOR} \
-  -m "[${BASE_BRANCH/oss\/release\//}] OSS to ENT merge of (${SHA::7})" \
-  -m "${BASE_BRANCH/oss\//} upstream merge of (${SHA::7})"
+  -t "[${BASE_BRANCH/oss\/release\//}] OSS to ENT merge of (${SHA::7})" \
+  -b "${BASE_BRANCH/oss\//} upstream merge of (${SHA::7})"
 gh pr merge --auto --merge
 
 # This PR will be need to be approved manually
diff --git a/.github/workflows/build-admin-ui.yaml b/.github/workflows/build-admin-ui.yaml
@@ -9,8 +9,8 @@ jobs:
     name: Install dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'
@@ -26,8 +26,8 @@ jobs:
     needs: [dependencies]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'
@@ -40,12 +40,12 @@ jobs:
           node-version: 16
       - run: yarn run build:ui:admin:oss
       - name: Upload artifact admin-ui
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: admin-ui
           path: ./ui/admin/dist/
       - name: Upload artifact OSS admin UI
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: admin-ui-oss
           path: ./ui/admin/dist/
@@ -54,8 +54,8 @@ jobs:
     needs: [dependencies]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'
@@ -68,7 +68,7 @@ jobs:
           node-version: 16
       - run: yarn run build:ui:admin:enterprise
       - name: Upload artifact enterprise admin UI
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: admin-ui-ent
           path: ./ui/admin/dist/
@@ -77,8 +77,8 @@ jobs:
     needs: [dependencies]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'
@@ -91,7 +91,7 @@ jobs:
           node-version: 16
       - run: yarn run build:ui:admin:hcp
       - name: Upload artifact HCP admin UI
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: admin-ui-hcp
           path: ./ui/admin/dist/
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -30,11 +30,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@f9a7c6738f28efb36e31d49c53a201a9c5d6a476 # codeql-bundle-v2.14.2
+      uses: github/codeql-action/init@8e0b1c74b1d5a0077b04d064c76ee714d3da7637 # codeql-bundle-v2.14.6
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,4 +54,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@f9a7c6738f28efb36e31d49c53a201a9c5d6a476 # codeql-bundle-v2.14.2
+      uses: github/codeql-action/analyze@8e0b1c74b1d5a0077b04d064c76ee714d3da7637 # codeql-bundle-v2.14.6
diff --git a/.github/workflows/monorepo-validate.yaml b/.github/workflows/monorepo-validate.yaml
@@ -6,8 +6,8 @@ jobs:
     name: Install dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'
@@ -24,8 +24,8 @@ jobs:
     needs: [dependencies]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'
@@ -43,8 +43,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'
@@ -62,8 +62,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'

diff --git a/.github/workflows/oss-merge.yml b/.github/workflows/oss-merge.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
         with:
           token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
       - run: |

diff --git a/.github/workflows/ui-release-trigger.yml b/.github/workflows/ui-release-trigger.yml
@@ -9,7 +9,7 @@ jobs:
   trigger-gha-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - name: Release description
         run: |
           echo "Triggering release with a TAG ${GITHUB_REF#refs/tags/}"