Skip to content

Commit f8caa19

Browse files
authored
Merge branch 'main' into ep/picosvg
2 parents 7b8310c + e05ddd3 commit f8caa19

18 files changed

Lines changed: 74 additions & 37 deletions

File tree

.changeset/cuddly-walls-build.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/nice-kings-relate.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/red-pets-applaud.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/selfish-pianos-talk.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/sixty-pigs-brake.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/package_api.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Package API
2+
on:
3+
pull_request_target:
4+
types:
5+
- labeled
6+
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.head_ref }}
9+
cancel-in-progress: true
10+
11+
permissions:
12+
contents: write
13+
14+
jobs:
15+
update:
16+
if: >
17+
github.event.pull_request.head.repo.full_name == 'primer/octicons' &&
18+
contains(github.event.pull_request.labels.*.name, 'api changes approved') }}
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout default branch
22+
uses: actions/checkout@v3
23+
with:
24+
repository: ${{ github.event.pull_request.head.repo.full_name }}
25+
ref: ${{ github.head_ref }}
26+
- uses: actions/setup-node@v3
27+
with:
28+
node-version: '16.x'
29+
registry-url: 'https://registry.npmjs.org'
30+
- name: Install dependencies
31+
run: yarn
32+
- name: Install workspace dependencies
33+
working-directory: lib/octicons_react
34+
run: yarn
35+
- name: Build project
36+
run: yarn build
37+
- name: Build package
38+
working-directory: lib/octicons_react
39+
run: yarn build
40+
- name: Update snapshots
41+
working-directory: lib/octicons_react
42+
run: yarn test -u
43+
- uses: stefanzweifel/git-auto-commit-action@v4
44+
with:
45+
commit_message: 'chore(project): update @primer/octicons-react Public API'
46+
- uses: actions-ecosystem/action-remove-labels@v1
47+
with:
48+
labels: 'api changes approved'

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
node-version: 14.x
2525

2626
- name: Setup Ruby
27-
uses: actions/setup-ruby@v1
27+
uses: ruby/setup-ruby@v1
2828
with:
29-
ruby-version: 3.0.x
29+
ruby-version: 2.7
3030

3131
- name: Install dependencies
3232
run: |

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## 17.10.0
4+
5+
### Minor Changes
6+
7+
- [#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
8+
9+
* [#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
10+
11+
- [#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
12+
13+
* [#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
14+
15+
- [#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
16+
317
## 17.9.0
418

519
### Minor Changes
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Octicons
2-
VERSION = "17.9.0".freeze
2+
VERSION = "17.10.0".freeze
33
end

lib/octicons_helper/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source "https://rubygems.org"
22

33
gemspec
44

5-
gem "octicons", "17.9.0"
5+
gem "octicons", "17.10.0"
66
gem "rails"
77

88
group :development, :test do

0 commit comments

Comments
 (0)