Merge branch 'main' into remove-pagelayout-content-main-landmark

primer · Aug 28, 2023 · d04beb2 · d04beb2
2 parents 665bcea + 77f05b4
commit d04beb2
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 39 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,8 +7,8 @@ on:
       - next-major
 
 jobs:
-  release-main:
-    if: github.ref_name == 'main'
+  get-access-token:
+    runs-on: ubuntu-latest
     steps:
       - id: get-access-token
         uses: camertron/github-app-installation-auth-action@v1
@@ -18,27 +18,23 @@ jobs:
           client-id: ${{ vars.PRIMER_APP_CLIENT_ID_SHARED }}
           client-secret: ${{ secrets.PRIMER_APP_CLIENT_SECRET_SHARED }}
           installation-id: ${{ vars.PRIMER_APP_INSTALLATION_ID_SHARED }}
-      - name: Main
-        uses: primer/.github/.github/workflows/release.yml@main
-        secrets:
-          gh_token: ${{ steps.get-access-token.outputs.access-token }}
-          npm_token: ${{ secrets.NPM_AUTH_TOKEN_SHARED }}
+
+  release-main:
+    if: github.ref_name == 'main'
+    name: Main
+    needs: get-access-token
+    uses: primer/.github/.github/workflows/release.yml@main
+    secrets:
+      gh_token: ${{ needs.get-access-token.steps.get-access-token.outputs.access-token }}
+      npm_token: ${{ secrets.NPM_AUTH_TOKEN_SHARED }}
 
   release-next-major:
     if: github.ref_name == 'next-major'
-    steps:
-      - id: get-access-token
-        uses: camertron/github-app-installation-auth-action@v1
-        with:
-          app-id: ${{ vars.PRIMER_APP_ID_SHARED }}
-          private-key: ${{ secrets.PRIMER_APP_PRIVATE_KEY_SHARED }}
-          client-id: ${{ vars.PRIMER_APP_CLIENT_ID_SHARED }}
-          client-secret: ${{ secrets.PRIMER_APP_CLIENT_SECRET_SHARED }}
-          installation-id: ${{ vars.PRIMER_APP_INSTALLATION_ID_SHARED }}
-      - name: Next major
-        uses: primer/.github/.github/workflows/release.yml@main
-        with:
-          title: Release tracking (next major)
-        secrets:
-          gh_token: ${{ steps.get-access-token.outputs.access-token }}
-          npm_token: ${{ secrets.NPM_AUTH_TOKEN_SHARED }}
+    name: Next major
+    needs: get-access-token
+    uses: primer/.github/.github/workflows/release.yml@main
+    with:
+      title: Release tracking (next major)
+    secrets:
+      gh_token: ${{ needs.get-access-token.steps.get-access-token.outputs.access-token }}
+      npm_token: ${{ secrets.NPM_AUTH_TOKEN_SHARED }}
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -13,7 +13,7 @@
     "npm": ">=7"
   },
   "dependencies": {
-    "@primer/gatsby-theme-doctocat": "^4.6.3",
+    "@primer/gatsby-theme-doctocat": "^4.7.1",
     "@primer/octicons-react": "^17.7.0",
     "@primer/primitives": "4.1.0",
     "@styled-system/prop-types": "^5.1.0",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -126,7 +126,7 @@
   },
   "devDependencies": {
     "@actions/core": "1.10.0",
-    "@babel/cli": "7.22.5",
+    "@babel/cli": "7.22.10",
     "@babel/core": "7.22.5",
     "@babel/eslint-parser": "7.21.3",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",