Skip to content

Commit

Permalink
Merge branch 'main' into ep/picosvg
Browse files Browse the repository at this point in the history
  • Loading branch information
eliperkins authored Dec 13, 2022
2 parents 7b8310c + e05ddd3 commit f8caa19
Show file tree
Hide file tree
Showing 18 changed files with 74 additions and 37 deletions.
5 changes: 0 additions & 5 deletions .changeset/cuddly-walls-build.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/nice-kings-relate.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/red-pets-applaud.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/selfish-pianos-talk.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/sixty-pigs-brake.md

This file was deleted.

48 changes: 48 additions & 0 deletions .github/workflows/package_api.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Package API
on:
pull_request_target:
types:
- labeled

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

permissions:
contents: write

jobs:
update:
if: >
github.event.pull_request.head.repo.full_name == 'primer/octicons' &&
contains(github.event.pull_request.labels.*.name, 'api changes approved') }}
runs-on: ubuntu-latest
steps:
- name: Checkout default branch
uses: actions/checkout@v3
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.head_ref }}
- uses: actions/setup-node@v3
with:
node-version: '16.x'
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: yarn
- name: Install workspace dependencies
working-directory: lib/octicons_react
run: yarn
- name: Build project
run: yarn build
- name: Build package
working-directory: lib/octicons_react
run: yarn build
- name: Update snapshots
working-directory: lib/octicons_react
run: yarn test -u
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: 'chore(project): update @primer/octicons-react Public API'
- uses: actions-ecosystem/action-remove-labels@v1
with:
labels: 'api changes approved'
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/octicons_gem/lib/octicons/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Octicons
VERSION = "17.9.0".freeze
VERSION = "17.10.0".freeze
end
2 changes: 1 addition & 1 deletion lib/octicons_helper/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/octicons_helper/lib/octicons_helper/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module OcticonsHelper
VERSION = "17.9.0".freeze
VERSION = "17.10.0".freeze
end
2 changes: 1 addition & 1 deletion lib/octicons_helper/octicons_helper.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lib/octicons_jekyll/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/octicons_jekyll/jekyll-octicons.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lib/octicons_jekyll/lib/jekyll-octicons/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lib/octicons_node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/octicons",
"version": "17.9.0",
"version": "17.10.0",
"description": "A scalable set of icons handcrafted with <3 by GitHub.",
"homepage": "https://primer.style/octicons",
"author": "GitHub Inc.",
Expand Down
2 changes: 1 addition & 1 deletion lib/octicons_react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/octicons-react",
"version": "17.9.0",
"version": "17.10.0",
"description": "A scalable set of icons handcrafted with <3 by GitHub.",
"homepage": "https://primer.style/octicons",
"author": "GitHub, Inc.",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/octicons",
"version": "17.9.0",
"version": "17.10.0",
"publishConfig": {
"registry": "no registry, don't publish from this package.json."
},
Expand Down

0 comments on commit f8caa19

Please sign in to comment.