Merge branch 'update-from-upstream' into update-upstream

opf · Sep 7, 2023 · d9288fb · d9288fb
2 parents f4c5724 + 5c20792
commit d9288fb
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 2 deletions.
diff --git a/.changeset/mean-paws-tease.md b/.changeset/mean-paws-tease.md
@@ -0,0 +1,5 @@
+---
+"@primer/octicons": minor
+---
+
+Fix Feed icon alignment issue and name collision
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -35,6 +35,15 @@ jobs:
           yarn
           bundle install
 
+      - 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: Create release pull request or publish to npm
         id: changesets
         uses: changesets/action@v1
@@ -43,5 +52,5 @@ jobs:
           version: yarn changeset:version
           publish: script/changeset-publish
         env:
-          GITHUB_TOKEN: ${{ secrets.GPR_AUTH_TOKEN_SHARED }}
+          GITHUB_TOKEN: ${{ steps.get-access-token.outputs.access-token }}
           NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN_SHARED }}
diff --git a/icons/feed-issue-closed-16.svg b/icons/feed-issue-closed-16.svg
diff --git a/icons/feed-issue-draft-16.svg b/icons/feed-issue-draft-16.svg
diff --git a/icons/feed-issue-open-16.svg b/icons/feed-issue-open-16.svg
diff --git a/icons/feed-issue-reopen-16.svg b/icons/feed-issue-reopen-16.svg
diff --git a/icons/feed-plus-16.svg b/icons/feed-plus-16.svg
diff --git a/icons/feed-public-16.svg b/icons/feed-public-16.svg
diff --git a/icons/feed-pull-request-closed-16.svg b/icons/feed-pull-request-closed-16.svg
diff --git a/icons/feed-pull-request-draft-16.svg b/icons/feed-pull-request-draft-16.svg
diff --git a/icons/feed-pull-request-open-16.svg b/icons/feed-pull-request-open-16.svg
diff --git a/lib/octicons_react/__tests__/__snapshots__/public-api.test.js.snap b/lib/octicons_react/__tests__/__snapshots__/public-api.test.js.snap
@@ -99,8 +99,17 @@ exports[`@primer/octicons-react should not update exports without a semver chang
   "FeedDiscussionIcon",
   "FeedForkedIcon",
   "FeedHeartIcon",
+  "FeedIssueClosedIcon",
+  "FeedIssueDraftIcon",
+  "FeedIssueOpenIcon",
+  "FeedIssueReopenIcon",
   "FeedMergedIcon",
   "FeedPersonIcon",
+  "FeedPlusIcon",
+  "FeedPublicIcon",
+  "FeedPullRequestClosedIcon",
+  "FeedPullRequestDraftIcon",
+  "FeedPullRequestOpenIcon",
   "FeedRepoIcon",
   "FeedRocketIcon",
   "FeedStarIcon",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@openproject/octicons",
   "version": "19.6.7",
+  "name": "@openproject/octicons",
   "publishConfig": {
     "registry": "no registry, don't publish from this package.json."
   },