v8.4.0

.github/CONTRIBUTING.md

@@ -26,7 +26,7 @@ Make sure your duplicate file can be viewed by others. In the share menu "Anyone
 
 You can submit a pull request updating the `figma.url` configuration in the root [package.json](https://github.com/primer/octicons/blob/master/package.json#L10) 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. 
+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.
 
 Once the build passes on your pull request, you should see statuses with all the alpha versions of the libraries. You can then use these to test your changes.
 
@@ -59,9 +59,11 @@ Once the new changes have been added the new components to the master Octicons f
 
 After you've published the latest changes in the Figma file, create a release branch in the [Octicons repo](https://github.com/primer/octicons).
 
-Update the [changelog](https://github.com/primer/octicons/blob/master/CHANGELOG.md) with the new changes pertaining to this version.
+Update the [CHANGELOG](https://github.com/primer/octicons/blob/master/CHANGELOG.md) with the new changes pertaining to this version.
 
-Once the changlog has been updated, run `npm run bump`. This will guide you through a prompt asking what all the new versions of the packages should be. In the context of Octicons, significant changes to the library or workflow, or removing an icon would be considered a major update, adding a new icon would be considered a minor update, and fixing an icon would be considered a patch. Reach out in the #design-systems Slack channel if you're unsure! 
+Once the CHANGELOG has been updated, run `npm version <newversion>`. This will update package.json with the new version, then update all the `lib/*` packages with the same version. If that runs smoothly, it should commit the changed files. Push that commit to your release branch.
+
+In the context of Octicons, significant changes to the library or workflow, or removing an icon would be considered a major update, adding a new icon would be considered a minor update, and fixing an icon would be considered a patch. Reach out in the #design-systems Slack channel if you're unsure!
 
 After, push up your branch and open a pull request into master.
 

.github/actions/build_node/Dockerfile

@@ -0,0 +1,10 @@
+FROM node:10-slim
+
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y \
+        jq && \
+        apt-get clean -y && \
+    rm -rf /var/lib/apt/lists/*
+
+ADD entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]

.github/actions/build_node/entrypoint.sh

@@ -0,0 +1,51 @@
+#!/bin/bash -l
+
+set -e
+
+if [ -n "$NPM_AUTH_TOKEN" ]; then
+  # Respect NPM_CONFIG_USERCONFIG if it is provided, default to $HOME/.npmrc
+  NPM_CONFIG_USERCONFIG="${NPM_CONFIG_USERCONFIG-"$HOME/.npmrc"}"
+  NPM_REGISTRY_URL="${NPM_REGISTRY_URL-registry.npmjs.org}"
+
+  # Allow registry.npmjs.org to be overridden with an environment variable
+  printf "//%s/:_authToken=%s\\nregistry=%s" "$NPM_REGISTRY_URL" "$NPM_AUTH_TOKEN" "$NPM_REGISTRY_URL" > "$NPM_CONFIG_USERCONFIG"
+  chmod 0600 "$NPM_CONFIG_USERCONFIG"
+fi
+
+PACKAGE_VERSION=$(jq '.version' --raw-output ./package.json)
+
+echo "************* Building v$PACKAGE_VERSION *************"
+
+PUBLISH_TAG=latest
+if [[ "$PACKAGE_VERSION" =~ ^0\.0\.0\- ]]
+then
+  PUBLISH_TAG=canary
+elif [[ "$PACKAGE_VERSION" =~ \-rc ]]
+then
+  PUBLISH_TAG=next
+fi
+
+cd ./lib/$*
+
+echo "**************** Copying assets files to build directory ****************"
+cp -R ../build/ .
+
+echo "**************** Installing ****************"
+npm install
+
+echo "**************** Building ****************"
+npm run build
+
+echo "**************** Linting ****************"
+npm run lint
+
+echo "**************** Testing  ****************"
+npm run test
+
+{
+  echo "**************** Publishing ****************"
+  npm version $PACKAGE_VERSION && npm publish --tag $PUBLISH_TAG --access public
+} || {
+  # Bail out of publishing
+  exit 0
+}

.github/actions/build_ruby/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:2.6.0
+
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y \
+        jq && \
+        apt-get clean -y && \
+    rm -rf /var/lib/apt/lists/*
+
+ADD entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]

.github/actions/build_ruby/entrypoint.sh

@@ -0,0 +1,42 @@
+#!/bin/bash -l
+
+set -e
+
+PACKAGE_VERSION=$(jq '.version' --raw-output ./package.json)
+
+PACKAGE_VERSION=$(echo $PACKAGE_VERSION | sed -e 's/^0\.0\.0./0.0.0.pre./g')
+PACKAGE_VERSION=$(echo $PACKAGE_VERSION | sed -e 's/-rc/.pre/g')
+
+echo "************* Building v$PACKAGE_VERSION *************"
+
+# Setup rubygems creds
+mkdir -p ~/.gem
+cat << EOF > ~/.gem/credentials
+---
+:rubygems_api_key: ${RUBYGEMS_TOKEN}
+EOF
+chmod 0600 ~/.gem/credentials
+
+cd ./lib/$*
+
+echo "**************** Copying assets files to build directory ****************"
+cp -R ../build lib/
+
+perl -pi -e "s/\"octicons\", \"[^\"]+\"/\"octicons\", \"${PACKAGE_VERSION}\"/" ./Gemfile ./*.gemspec
+
+echo "**************** Installing ****************"
+bundle install
+
+echo "**************** Linting ****************"
+bundle exec rake lint
+
+echo "**************** Testing  ****************"
+bundle exec rake test
+
+echo "**************** Versioning ****************"
+bundle exec rake version\["$PACKAGE_VERSION"\]
+
+bundle update
+
+echo "**************** Building ****************"
+(bundle exec rake build; gem push pkg/*.gem) && wait

.github/actions/version/Dockerfile

@@ -0,0 +1,7 @@
+FROM node:10-slim
+
+WORKDIR /
+COPY . /
+RUN npm install
+
+ENTRYPOINT [ "node", "/entrypoint.js" ]

.github/actions/version/entrypoint.js

@@ -0,0 +1,37 @@
+const fs = require('fs')
+const {
+  resolve
+} = require('path')
+ const {
+  GITHUB_REF,
+  GITHUB_SHA
+} = process.env
+
+// Octicons package
+const pkg = require(resolve(process.cwd(), 'package.json'))
+
+// GitHub info
+const branchName = GITHUB_REF.replace('refs/heads/', '')
+const shortSha = GITHUB_SHA.slice(0,7)
+let releaseMatch = null
+
+const writePackageJson = () => {
+  fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2), 'utf8')
+}
+
+// If it's a release branch
+if (releaseMatch = branchName.match(/^release-([\d\.]+)/i)) {
+  console.log('Versioning release candidate')
+  console.log(`${pkg.version} => ${releaseMatch[1]}`)
+  pkg.version = `${releaseMatch[1]}-rc.${shortSha}`
+  writePackageJson()
+}
+
+ // Otherwise
+else if (branchName != 'master') {
+  const newVersion = `0.0.0-${shortSha}`
+  console.log('Versioning prerelease')
+  console.log(`${pkg.version} => ${newVersion}`)
+  pkg.version = newVersion
+  writePackageJson()
+}

.github/main.workflow

@@ -0,0 +1,92 @@
+workflow "Octicons" {
+  on = "push"
+  resolves = [
+    "Build & Deploy node.js",
+    "Build & Deploy react",
+    "Build & Deploy rubygem",
+    "Build & Deploy rails helper",
+    "Build & Deploy jekyll plugin"
+  ]
+}
+
+action "Install" {
+  uses = "actions/npm@master"
+  args = "install"
+}
+
+action "Version" {
+  needs = ["Install"]
+  uses = "./.github/actions/version"
+}
+
+action "Lint" {
+  needs = ["Install"]
+  uses = "actions/npm@master"
+  args = "run lint"
+}
+
+action "Test" {
+  needs = ["Lint", "Export SVG from Figma"]
+  uses = "actions/npm@master"
+  args = "test"
+}
+
+action "Export SVG from Figma" {
+  needs = ["Version"]
+  uses = "primer/figma-action@master"
+  secrets = [
+    "FIGMA_TOKEN"
+  ]
+  env = {
+    "FIGMA_FILE_URL" = "https://www.figma.com/file/FP7lqd1V00LUaT5zvdklkkZr/Octicons"
+  }
+  args = [
+    "format=svg",
+    "dir=./lib/build"
+  ]
+}
+
+action "Build & Deploy node.js" {
+  needs = ["Test"]
+  uses = "./.github/actions/build_node"
+  args = "octicons_node"
+  secrets = [
+    "NPM_AUTH_TOKEN"
+  ]
+}
+
+action "Build & Deploy react" {
+  needs = ["Test"]
+  uses = "./.github/actions/build_node"
+  args = "octicons_react"
+  secrets = [
+    "NPM_AUTH_TOKEN"
+  ]
+}
+
+action "Build & Deploy rubygem" {
+  needs = ["Test"]
+  uses = "./.github/actions/build_ruby"
+  args = "octicons_gem"
+  secrets = [
+    "RUBYGEMS_TOKEN"
+  ]
+}
+
+action "Build & Deploy rails helper" {
+  needs = ["Build & Deploy rubygem"]
+  uses = "./.github/actions/build_ruby"
+  args = "octicons_helper"
+  secrets = [
+    "RUBYGEMS_TOKEN"
+  ]
+}
+
+action "Build & Deploy jekyll plugin" {
+  needs = ["Build & Deploy rubygem"]
+  uses = "./.github/actions/build_ruby"
+  args = "octicons_jekyll"
+  secrets = [
+    "RUBYGEMS_TOKEN"
+  ]
+}

.gitignore

@@ -5,7 +5,6 @@
 .bundle
 .env
 node_modules
-lib/*/package-lock.json
 vendor
 
 # Ignore build/export artifacts

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 8.4.0
+
+### :house: Internal
+- Using Actions to build and deploy Octicons https://github.com/primer/octicons/pull/276
+
+#### Committers: 1
+- Jon Rohan ([jonrohan](https://github.com/jonrohan))
+
 # 8.3.0
 
 - New "changes requested" icon https://github.com/primer/octicons/pull/267

lib/octicons_gem/Rakefile

@@ -1,9 +1,22 @@
 require "rake/testtask"
+require "rubocop/rake_task"
+require "bundler/gem_tasks"
+
+RuboCop::RakeTask.new(:lint) do |t|
+  t.options = ["--display-cop-names"]
+end
 
 Rake::TestTask.new do |t|
   t.libs = ["lib", "test"]
   t.test_files = FileList["test/*_test.rb"]
 end
 
+task :version, [:v] do |t, args|
+  out = "module Octicons\n"\
+    "  VERSION = \"#{args[:v]}\".freeze\n"\
+    "end"
+  File.open(File.expand_path("../lib/octicons/version.rb", __FILE__), "w") { |file| file.puts out }
+end
+
 desc "Run tests"
 task default: :test

lib/octicons_gem/lib/octicons/version.rb

@@ -1,3 +1,3 @@
 module Octicons
-  VERSION = "8.3.0".freeze
+  VERSION = "8.4.0".freeze
 end