Merge branch 'main' into ci/add-package-api-workflow

primer · Dec 13, 2022 · dfeeeb3 · dfeeeb3
2 parents 1bd9ede + 6648b96
commit dfeeeb3
Show file tree

Hide file tree

Showing 29 changed files with 107 additions and 82 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -97,26 +97,26 @@ jobs:
       run:
         working-directory: ./lib/octicons_gem
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-    - uses: actions/download-artifact@v2
-      with:
-        name: octicons-build
-        path: ./lib/octicons_gem/lib/build
-    - run: bundle install
-    - name: Linting
-      run: bundle exec rake lint
-    - name: Testing
-      run: bundle exec rake test
-    - name: Build
-      run: bundle exec rake build
-    - uses: actions/upload-artifact@master
-      with:
-        name: octicons-gem
-        path: ./lib/octicons_gem/pkg
+      - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - uses: actions/download-artifact@v2
+        with:
+          name: octicons-build
+          path: ./lib/octicons_gem/lib/build
+      - run: bundle install
+      - name: Linting
+        run: bundle exec rake lint
+      - name: Testing
+        run: bundle exec rake test
+      - name: Build
+        run: bundle exec rake build
+      - uses: actions/upload-artifact@master
+        with:
+          name: octicons-gem
+          path: ./lib/octicons_gem/pkg
 
   octicons_helper:
     name: 'gem:octicons_helper'
@@ -126,20 +126,20 @@ jobs:
       run:
         working-directory: ./lib/octicons_helper
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-    - uses: actions/download-artifact@v2
-      with:
-        name: octicons-gem
-        path: ./lib/octicons_helper/vendor/cache
-    - run: bundle install
-    - name: Linting
-      run: bundle exec rake lint
-    - name: Testing
-      run: bundle exec rake test
+      - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - uses: actions/download-artifact@v2
+        with:
+          name: octicons-gem
+          path: ./lib/octicons_helper/vendor/cache
+      - run: bundle install
+      - name: Linting
+        run: bundle exec rake lint
+      - name: Testing
+        run: bundle exec rake test
 
   octicons_jekyll:
     name: 'gem:octicons_jekyll'
@@ -149,17 +149,17 @@ jobs:
       run:
         working-directory: ./lib/octicons_jekyll
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-    - uses: actions/download-artifact@v2
-      with:
-        name: octicons-gem
-        path: ./lib/octicons_jekyll/vendor/cache
-    - run: bundle install
-    - name: Linting
-      run: bundle exec rake lint
-    - name: Testing
-      run: bundle exec rake test
+      - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - uses: actions/download-artifact@v2
+        with:
+          name: octicons-gem
+          path: ./lib/octicons_jekyll/vendor/cache
+      - run: bundle install
+      - name: Linting
+        run: bundle exec rake lint
+      - name: Testing
+        run: bundle exec rake test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,9 +24,9 @@ jobs:
           node-version: 14.x
 
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.x
+          ruby-version: 2.7
 
       - name: Install dependencies
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 17.10.0
+
+### Minor Changes
+
+- [#874](https://github.com/primer/octicons/pull/874) [`3ff5aa6`](https://github.com/primer/octicons/commit/3ff5aa669d33a88048825d229656abfa459e4d64) Thanks [@gavinmn](https://github.com/gavinmn)! - Add rel-file-path-16.svg, rel-file-path-24.svg
+
+* [#878](https://github.com/primer/octicons/pull/878) [`5797f85`](https://github.com/primer/octicons/commit/5797f859859df31cd769e102fbf518ccaf9a976f) Thanks [@CameronFoxly](https://github.com/CameronFoxly)! - Save unlink-16.svg, unlink-24.svg
+
+- [#879](https://github.com/primer/octicons/pull/879) [`2fa8425`](https://github.com/primer/octicons/commit/2fa8425dab93346cd5d8b44bfc3709f0126e19fb) Thanks [@gavinmn](https://github.com/gavinmn)! - Save read-32.svg, unread-32.svg, read-48.svg, unread-48.svg
+
+* [#873](https://github.com/primer/octicons/pull/873) [`0d1b1ff`](https://github.com/primer/octicons/commit/0d1b1ffca5334c6207cf975f69459153f1d1cbfd) Thanks [@gavinmn](https://github.com/gavinmn)! - Add Goal icons
+
+- [#877](https://github.com/primer/octicons/pull/877) [`3916b29`](https://github.com/primer/octicons/commit/3916b29935d9845eec8726cc389b98281bc42b02) Thanks [@gavinmn](https://github.com/gavinmn)! - Save sponsor-tiers-16.svg, sponsor-tiers-24.svg
+
 ## 17.9.0
 
 ### Minor Changes

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,33 +4,26 @@ Thank you for your interest in contributing to Octicons! We are currently only a
 
 ## Icon request process
 
-### 1. Icon request is made
+### 1. Icon review request is made
 
-- Icon requests are made using the [icon request template](https://github.com/github/primer/issues/new?assignees=ashygee&labels=octicon%2C+request&template=2-icon-request.md&title=%5BIcon+request%5D+) in the github/primer repo (visible to GitHub staff only).
-- Once received, the issue will be placed in the **❓ Icon requests (inbox)** column of the [Octicons project board](https://github.com/orgs/github/projects/4503/views/11)
-- Icons in the inbox will be triaged by a maintainer from the Octicons team. Maintainers should reply with a comment on the issue and then move the issue to the **💬 Responded** column of the Octicons [project board](https://github.com/orgs/github/projects/4503/views/11)
+- Icon review requests are made using the [icon request template](https://github.com/github/primer/issues/new?assignees=&labels=octicon%2C+request%2C+needs+triage&template=02-icon-request.md&title=%5BIcon+request%5D+) in the github/primer repo (visible to GitHub staff only).
+- Icons in the Primer Roadmap inbox will be triaged by a maintainer from the Octicons team. Maintainers should reply with a comment on the issue and then move the issue to Primer Teams Backlog.
 
-### 2. Assigning icons
+### 2. Working on icons
 
-- Each new icon request will initially be discussed async within our #octicons channel on Slack.
-  - If the icon requires further discussion or needs more context before assigning, a maintainer will leave a comment on the issue requesting more information from the original requestor and the issue will be moved to the **⚠️ To discuss** column of the Octicons [project board](https://github.com/orgs/github/projects/4503/views/11)
-  - If a currently existing icon can be used to clearly convey the correct metaphor, a suggestion will be made in the icon request issue and the issue will be moved to the **⚠️ To discuss** column of the Octicons [project board](https://github.com/orgs/github/projects/4503/views/11)
-  - If it is decided that a new icon needs to be created the issue will be moved to the **📫 To do** column of the Octicons [project board](https://github.com/orgs/github/projects/4503/views/11)
-- Icon requests will be assigned to a designer in the weekly Octicons sync held on Wednesdays
-  - Once an icon has been assigned, it's up to assigned designer to be responsible for communicating the icon's status
-  - Other designers are welcome to collaborate on any icons
+- If an icon recommendation can be made async, we will discuss it in #primer-octicons or directly in the issue.
+- Icon review requests require a working session, we will send an invitation. 
+  - Once an icon has been assigned, it's up to assigned designer to be responsible for communicating the icon's status and drive the work forward.
 
 ### 3. Icon design, review, and communication
 
-- Once design has been started on an icon, the request issue will be moved to the **✒️In Progress** column of the Octicons [project board](https://github.com/orgs/github/projects/4503/views/11)
+- Once design has been started on an icon, the request issue will be moved to the **Design in Progress** column of the Primer Teams Backlog.
 - Designers should design the icon in Figma and when ready for review, use the [Octicons Push plugin](https://www.figma.com/community/plugin/825432045044458754/Octicons-Push) to create a PR
-  - After a PR is created link to the PR in the icon request issue and move the issue to the **👁‍🗨 Ready for review** column of the Octicons [project board](https://github.com/orgs/github/projects/4503/views/11)
-  - All review communication will be contained within the PR
-  - PRs need approval from the icon requestor (stakeholder) and at least one designer on the octicons maintainer team
+  - After a PR is created link to the PR in the icon request issue. PRs need approval from the icon requestor (stakeholder) and at least one designer on the octicons maintainer team.
 
 ### 4. Icon request completed
-- When an icon request PR has been approved by both the requestor and a member of Octicons maintainer team, the icon request is moved to the **🔼 Push to repo** column of the Octicons [project board](https://github.com/github/primer/projects/2)
-- After a new release has been made, the new icons that were added will have their request issues moved to the **✔ Done** column
+- When an icon request PR has been approved, communicate that in the issue.
+- After the Octicons release, the new icons that were added will have their request issues moved to the **Done** column
 
 
 ## Adding or updating an icon

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 ![octicons cover dark](https://user-images.githubusercontent.com/54012/138925203-80e1afa1-ba54-4731-9525-3c41186663f9.png#gh-dark-mode-only)
 <br>
 <br>
-<h1 align="center">Octicons</h1>
+<h1 align="center">Primer Octicons</h1>
 
 <p align="center">Octicons are a set of SVG icons built by GitHub for GitHub.</p>
 
@@ -44,9 +44,9 @@ The octicons node.js library is the main JavaScript library. With [a JavaScript
 
 If you have feedback and ideas for improvement, open a new issue in this repo, using the appropriate [issue template](https://github.com/primer/octicons/issues/new/choose).
 
-### Request a new icon (GitHub staff only)
+### Request an Icon Review (GitHub staff only)
 
-To request a new icon, open an issue using the [icon request](https://github.com/github/primer/issues/new?assignees=ashygee&labels=octicon%2C+request&template=2-icon-request.md&title=%5BIcon+request%5D+) template in github/primer.
+To request an icon review for inclusion in the Octicons Library, open an issue using the [icon request](https://github.com/github/primer/issues/new?assignees=&labels=octicon%2C+request%2C+needs+triage&template=02-icon-request.md&title=%5BIcon+request%5D++) template in github/primer.
 
 ### Adding or updating an icon
 

diff --git a/icons/goal-16.svg b/icons/goal-16.svg
diff --git a/icons/goal-24.svg b/icons/goal-24.svg
diff --git a/icons/read-16.svg b/icons/read-16.svg
diff --git a/icons/read-24.svg b/icons/read-24.svg
diff --git a/icons/rel-file-path-16.svg b/icons/rel-file-path-16.svg
diff --git a/icons/rel-file-path-24.svg b/icons/rel-file-path-24.svg
diff --git a/icons/sponsor-tiers-16.svg b/icons/sponsor-tiers-16.svg
diff --git a/icons/sponsor-tiers-24.svg b/icons/sponsor-tiers-24.svg
diff --git a/icons/unlink-16.svg b/icons/unlink-16.svg
diff --git a/icons/unlink-24.svg b/icons/unlink-24.svg
diff --git a/icons/unread-16.svg b/icons/unread-16.svg
diff --git a/icons/unread-24.svg b/icons/unread-24.svg
diff --git a/keywords.json b/keywords.json
@@ -89,7 +89,7 @@
   "git-merge": ["join"],
   "git-pull-request": ["review"],
   "github-action": ["board", "workflow", "action", "automation"],
-  "globe": ["world", "earth", "planet"],
+  "globe": ["world", "earth", "planet", "enterprise"],
   "grabber": ["mover", "drag", "drop", "sort"],
   "graph": ["trend", "stats", "statistics"],
   "heart": ["love", "beat"],

diff --git a/lib/octicons_gem/lib/octicons/version.rb b/lib/octicons_gem/lib/octicons/version.rb
@@ -1,3 +1,3 @@
 module Octicons
-  VERSION = "17.9.0".freeze
+  VERSION = "17.10.0".freeze
 end
diff --git a/lib/octicons_helper/Gemfile b/lib/octicons_helper/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "octicons", "17.9.0"
+gem "octicons", "17.10.0"
 gem "rails"
 
 group :development, :test do

diff --git a/lib/octicons_helper/lib/octicons_helper/version.rb b/lib/octicons_helper/lib/octicons_helper/version.rb
@@ -1,3 +1,3 @@
 module OcticonsHelper
-  VERSION = "17.9.0".freeze
+  VERSION = "17.10.0".freeze
 end
diff --git a/lib/octicons_helper/octicons_helper.gemspec b/lib/octicons_helper/octicons_helper.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_dependency "octicons", "17.9.0"
+  s.add_dependency "octicons", "17.10.0"
   s.add_dependency "railties"
   s.add_dependency "actionview"
 end
diff --git a/lib/octicons_jekyll/Gemfile b/lib/octicons_jekyll/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "octicons", "17.9.0"
+gem "octicons", "17.10.0"
 
 group :development, :test do
   gem "minitest"

diff --git a/lib/octicons_jekyll/jekyll-octicons.gemspec b/lib/octicons_jekyll/jekyll-octicons.gemspec
@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "jekyll", ">= 3.6", "< 5.0"
-  s.add_dependency "octicons", "17.9.0"
+  s.add_dependency "octicons", "17.10.0"
 end
diff --git a/lib/octicons_jekyll/lib/jekyll-octicons/version.rb b/lib/octicons_jekyll/lib/jekyll-octicons/version.rb
@@ -3,6 +3,6 @@ module Liquid; class Tag; end; end
 
 module Jekyll
   class Octicons < Liquid::Tag
-    VERSION = "17.9.0".freeze
+    VERSION = "17.10.0".freeze
   end
 end