Skip to content

Commit

Permalink
Merge pull request #352 from primer/release-9.2.0
Browse files Browse the repository at this point in the history
Release 9.2.0
  • Loading branch information
jonrohan committed Oct 15, 2019
2 parents 8fd8686 + 006ec94 commit dd6d3a3
Show file tree
Hide file tree
Showing 10 changed files with 796 additions and 483 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Make sure your duplicate file can be viewed by others. In the share menu "Anyone

### Step 4, Pull Request: _(Optional)_

You can submit a pull request updating the `FIGMA_FILE_URL` configuration in the .github/[main.workflow](https://github.com/primer/octicons/blob/master/.github/main.workflow?short_path=dd94174#L41) with your Figma file. Doing so will generate alpha releases of [all the libraries that distribute Octicons](https://github.com/primer/octicons#libraries).
You can submit a pull request updating the `FIGMA_FILE_URL` configuration in the .github/workflows/[push.yml](https://github.com/primer/octicons/blob/master/.github/workflows/push.yml#L17) with your Figma file. Doing so will generate alpha releases of [all the libraries that distribute Octicons](https://github.com/primer/octicons#libraries).

If an icon was edited or added, you should see the before and after images directly in the PR. In addition, please describe your proposed changes in the PR's description.

Expand Down
92 changes: 0 additions & 92 deletions .github/main.workflow

This file was deleted.

119 changes: 119 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
on: push
name: Octicons Build
jobs:
setup:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: '10.x'
- name: Version
uses: ./.github/actions/version
- run: npm install
- name: Export SVG from Figma
uses: primer/figma-action@d7844a1927da9b8dd562cbf008c7da20e228607d
env:
FIGMA_FILE_URL: https://www.figma.com/file/FP7lqd1V00LUaT5zvdklkkZr/Octicons
FIGMA_TOKEN: ${{ secrets.FIGMA_TOKEN }}
with:
args: format=svg dir=./lib/build
- run: npm run lint
- run: npm test
- uses: actions/upload-artifact@master
with:
name: octicons
path: ./lib/build
gem:
runs-on: ubuntu-latest
needs: setup
steps:
- uses: actions/checkout@master
- name: Version
uses: ./.github/actions/version
- uses: actions/download-artifact@master
with:
name: octicons
path: ./lib/build
- uses: ./.github/actions/build_ruby
env:
RUBYGEMS_TOKEN: ${{ secrets.RUBYGEMS_TOKEN }}
with:
args: octicons_gem
- run: ls ./lib/octicons_gem/pkg
- uses: actions/upload-artifact@master
with:
name: octicons_gem
path: ./lib/octicons_gem/pkg
helper:
runs-on: ubuntu-latest
needs: gem
steps:
- uses: actions/checkout@master
- name: Version
uses: ./.github/actions/version
- uses: actions/download-artifact@master
with:
name: octicons
path: ./lib/build
- uses: actions/download-artifact@master
with:
name: octicons_gem
path: ./lib/octicons_helper/vendor/cache
- uses: ./.github/actions/build_ruby
env:
RUBYGEMS_TOKEN: ${{ secrets.RUBYGEMS_TOKEN }}
with:
args: octicons_helper
jekyll:
runs-on: ubuntu-latest
needs: gem
steps:
- uses: actions/checkout@master
- name: Version
uses: ./.github/actions/version
- uses: actions/download-artifact@master
with:
name: octicons
path: ./lib/build
- uses: actions/download-artifact@master
with:
name: octicons_gem
path: ./lib/octicons_jekyll/vendor/cache
- uses: ./.github/actions/build_ruby
env:
RUBYGEMS_TOKEN: ${{ secrets.RUBYGEMS_TOKEN }}
with:
args: octicons_jekyll
node:
runs-on: ubuntu-latest
needs: setup
steps:
- uses: actions/checkout@master
- name: Version
uses: ./.github/actions/version
- uses: actions/download-artifact@master
with:
name: octicons
path: ./lib/build
- uses: ./.github/actions/build_node
env:
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
with:
args: octicons_node
react:
runs-on: ubuntu-latest
needs: setup
steps:
- uses: actions/checkout@master
- name: Version
uses: ./.github/actions/version
- uses: actions/download-artifact@master
with:
name: octicons
path: ./lib/build
- uses: ./.github/actions/build_node
env:
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
with:
args: octicons_react
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# 9.2.0

# 9.1.1

### :bug: Bug Fix
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 @@ -13,6 +13,6 @@ Gem::Specification.new do |s|

s.require_paths = ["lib"]

s.add_dependency "jekyll", "~> 3.1"
s.add_dependency "jekyll", ">= 3.6", "< 5.0"
s.add_dependency "octicons", "9.1.1"
end

0 comments on commit dd6d3a3

Please sign in to comment.