Skip to content

Commit

Permalink
Adapting GH Actions and packages (#1)
Browse files Browse the repository at this point in the history
* Updates the gemspecs renaming the gems and adding OpenProject as co-authors

* More packaging options change

* Remove the packages we don't have interest to publish our own versions

* Makes the final release check look at our repository

* fix: make sure the npm package publishes to the @openproject org

---------

Co-authored-by: Benjamin Bädorf <[email protected]>
  • Loading branch information
mereghost and b12f authored Jul 17, 2023
1 parent 029d351 commit fd76f2e
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 54 deletions.
39 changes: 0 additions & 39 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,6 @@ jobs:
RUBYGEMS_TOKEN: ${{ secrets.RUBYGEMS_TOKEN }}
with:
args: octicons_helper
jekyll:
runs-on: ubuntu-latest
needs: gem
steps:
- uses: actions/checkout@master
- 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
Expand All @@ -87,24 +69,3 @@ jobs:
NPM_AUTH_TOKEN_SHARED: ${{ secrets.NPM_AUTH_TOKEN_SHARED }}
with:
args: octicons_node
react:
runs-on: ubuntu-latest
needs: setup
steps:
- uses: actions/checkout@master
- uses: actions/download-artifact@master
with:
name: octicons
path: ./lib/build
- name: Build @primer/octicons-react
uses: ./.github/actions/build_node
env:
NPM_AUTH_TOKEN_SHARED: ${{ secrets.NPM_AUTH_TOKEN_SHARED }}
with:
args: octicons_react
- name: Build @primer/styled-octicons
uses: ./.github/actions/build_node
env:
NPM_AUTH_TOKEN_SHARED: ${{ secrets.NPM_AUTH_TOKEN_SHARED }}
with:
args: octicons_styled
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
release:
name: Final
if: ${{ github.repository == 'primer/octicons' }}
if: ${{ github.repository == 'opf/openproject-octicons' }}

runs-on: ubuntu-latest
steps:
Expand Down
8 changes: 4 additions & 4 deletions lib/octicons_gem/octicons.gemspec
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
require File.expand_path("../lib/octicons/version", __FILE__)

Gem::Specification.new do |s|
s.name = "octicons"
s.name = "openproject-octicons"
s.version = Octicons::VERSION
s.summary = "GitHub's octicons gem"
s.platform = Gem::Platform::RUBY
s.description = "A package that distributes Octicons in a gem"
s.authors = ["GitHub Inc."]
s.email = ["support@github.com"]
s.authors = ["GitHub Inc.", "OpenProject GmbH"]
s.email = ["support@openproject.com"]
s.files = Dir["{lib}/**/*"] + ["LICENSE", "README.md"]
s.homepage = "https://github.com/primer/octicons"
s.homepage = "https://github.com/opf/openproject-octicons"
s.license = "MIT"
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", "19.4.0"
gem "openproject-octicons", "19.4.0"
gem "rails"

group :development, :test do
Expand Down
10 changes: 5 additions & 5 deletions lib/octicons_helper/octicons_helper.gemspec
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
require File.expand_path("../lib/octicons_helper/version", __FILE__)

Gem::Specification.new do |s|
s.name = "octicons_helper"
s.name = "openproject-octicons_helper"
s.version = OcticonsHelper::VERSION
s.summary = "Octicons rails helper"
s.description = "A rails helper that makes including svg Octicons simple."
s.authors = ["GitHub Inc."]
s.email = ["support@github.com"]
s.authors = ["GitHub Inc.", "OpenProject GmbH"]
s.email = ["support@openproject.com"]
s.files = Dir["{lib}/**/*"] + ["LICENSE", "README.md"]
s.homepage = "https://github.com/primer/octicons"
s.homepage = "https://github.com/opf/openproject-octicons"
s.license = "MIT"

s.require_paths = ["lib"]

s.add_dependency "octicons", "19.4.0"
s.add_dependency "openproject-octicons", "19.4.0"
s.add_dependency "railties"
s.add_dependency "actionview"
end
6 changes: 3 additions & 3 deletions lib/octicons_node/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@primer/octicons",
"name": "@openproject/octicons",
"version": "19.4.0",
"description": "A scalable set of icons handcrafted with <3 by GitHub.",
"homepage": "https://primer.style/octicons",
Expand All @@ -12,9 +12,9 @@
"index.scss",
"build"
],
"repository": "https://github.com/primer/octicons.git",
"repository": "https://github.com/opf/openproject-octicons.git",
"bugs": {
"url": "https://github.com/primer/octicons/issues"
"url": "https://github.com/opf/openproject-octicons/issues"
},
"scripts": {
"build": "\\cp -r ../build/ ./build && \\cp index.scss ./build/build.css",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@primer/octicons",
"name": "@openproject/octicons",
"version": "19.4.0",
"publishConfig": {
"registry": "no registry, don't publish from this package.json."
Expand Down

0 comments on commit fd76f2e

Please sign in to comment.