Skip to content

Commit d41c184

Browse files
Edouard-chinEdouard-chin
authored
Merge pull request #23 from shopify-playground/ec-rename
Rename the gem to `cibuildgem`
2 parents 19ae0ba + 3afef7d commit d41c184

34 files changed

+120
-135
lines changed

.github/actions/easy_compile/action.yml renamed to .github/actions/cibuildgem/action.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ inputs:
1010
description: "The step to run"
1111
required: true
1212
test-command:
13-
description: "The command to run the test suite. By default Easy Compile will run either `bundle exec rake test` or `bundle exec rake spec` depending on the test framework used."
13+
description: "The command to run the test suite. By default cibuildgem will run either `bundle exec rake test` or `bundle exec rake spec` depending on the test framework used."
1414
required: false
15-
default: "easy_compile test"
15+
default: "cibuildgem test"
1616

1717
runs:
1818
using: "composite"
1919
steps:
20-
- name: Install easy compile # TODO this can be removed once this tool is pusblished on RubyGems
20+
- name: Install cibuildgem # TODO this can be removed once this tool is pusblished on RubyGems
2121
shell: bash
2222
run: "rake install"
2323
working-directory: "${{ github.action_path }}"
@@ -33,7 +33,7 @@ runs:
3333
if: "${{ inputs.step == 'compile' }}"
3434
working-directory: ${{ inputs.working-directory }}
3535
shell: bash
36-
run: easy_compile package
36+
run: cibuildgem package
3737
- name: Upload artifacts
3838
if: "${{ inputs.step == 'compile' }}"
3939
uses: actions/upload-artifact@v4
@@ -55,12 +55,12 @@ runs:
5555
if: "${{ inputs.step == 'test_cross' }}"
5656
working-directory: ${{ inputs.working-directory }}
5757
shell: bash
58-
run: easy_compile copy_from_staging_to_lib
58+
run: cibuildgem copy_from_staging_to_lib
5959
- name: "Compile native"
6060
if: "${{ inputs.step == 'test_native' }}"
6161
working-directory: ${{ inputs.working-directory }}
6262
shell: bash
63-
run: easy_compile compile
63+
run: cibuildgem compile
6464
- name: "Execute the tests"
6565
if: "${{ startsWith(inputs.step, 'test') }}"
6666
working-directory: ${{ inputs.working-directory }}
@@ -86,7 +86,7 @@ runs:
8686
- name: "Push the gems to RubyGems"
8787
if: "${{ inputs.step == 'release' }}"
8888
shell: bash
89-
run: easy_compile release --glob "pkg/*"
89+
run: cibuildgem release --glob "pkg/*"
9090
- name: "Waiting for RubyGems to fully index the new gems"
9191
if: "${{ inputs.step == 'release' }}"
9292
shell: bash

.github/actions/easy_compile/dist/index.js renamed to .github/actions/cibuildgem/dist/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28208,7 +28208,7 @@ const os = __nccwpck_require__(857);
2820828208
const path = __nccwpck_require__(6928);
2820928209

2821028210
async function run(workingDirectory) {
28211-
let ccRubies = cp.execSync('easy_compile print_ruby_cc_version', { cwd: workingDirectory, encoding: 'utf-8' })
28211+
let ccRubies = cp.execSync('cibuildgem print_ruby_cc_version', { cwd: workingDirectory, encoding: 'utf-8' })
2821228212

2821328213
await downloadRubies(ccRubies.split(':'))
2821428214
setupRakeCompilerConfig(workingDirectory)
@@ -28231,7 +28231,7 @@ function setupRakeCompilerConfig(workingDirectory) {
2823128231
let rubiesRbConfig = fs.globSync(`${rubiesPath()}/*/*/lib/ruby/*/*/rbconfig.rb`)
2823228232
let currentRubyVersion = cp.execSync('ruby -v', { encoding: 'utf-8' }).match(/^ruby (\d\.\d\.\d)/)[1]
2823328233
let rbConfigPath = path.join(os.homedir(), ".rake-compiler", "config.yml")
28234-
let rubyPlatform = cp.execSync('easy_compile print_normalized_platform', { cwd: workingDirectory, encoding: 'utf-8' })
28234+
let rubyPlatform = cp.execSync('cibuildgem print_normalized_platform', { cwd: workingDirectory, encoding: 'utf-8' })
2823528235

2823628236
fs.mkdirSync(`${os.homedir()}/.rake-compiler`)
2823728237

.github/actions/easy_compile/package.json renamed to .github/actions/cibuildgem/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "easy_compile",
2+
"name": "cibuildgem",
33
"version": "1.0.0",
4-
"description": "A companion GitHub action for easy_compile.",
4+
"description": "A companion GitHub action for the cibuildgem ruby tool.",
55
"main": "index.js",
66
"repository": "https://github.com/rails/cool-stuff-fun-time",
77
"scripts": {

.github/actions/easy_compile/src/index.js renamed to .github/actions/cibuildgem/src/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const os = require('os');
77
const path = require('path');
88

99
async function run(workingDirectory) {
10-
let ccRubies = cp.execSync('easy_compile print_ruby_cc_version', { cwd: workingDirectory, encoding: 'utf-8' })
10+
let ccRubies = cp.execSync('cibuildgem print_ruby_cc_version', { cwd: workingDirectory, encoding: 'utf-8' })
1111

1212
await downloadRubies(ccRubies.split(':'))
1313
setupRakeCompilerConfig(workingDirectory)
@@ -30,7 +30,7 @@ function setupRakeCompilerConfig(workingDirectory) {
3030
let rubiesRbConfig = fs.globSync(`${rubiesPath()}/*/*/lib/ruby/*/*/rbconfig.rb`)
3131
let currentRubyVersion = cp.execSync('ruby -v', { encoding: 'utf-8' }).match(/^ruby (\d\.\d\.\d)/)[1]
3232
let rbConfigPath = path.join(os.homedir(), ".rake-compiler", "config.yml")
33-
let rubyPlatform = cp.execSync('easy_compile print_normalized_platform', { cwd: workingDirectory, encoding: 'utf-8' })
33+
let rubyPlatform = cp.execSync('cibuildgem print_normalized_platform', { cwd: workingDirectory, encoding: 'utf-8' })
3434

3535
fs.mkdirSync(`${os.homedir()}/.rake-compiler`)
3636

.github/actions/easy_compile/yarn.lock renamed to .github/actions/cibuildgem/yarn.lock

File renamed without changes.

‎.github/actions/easy_compile/__tests__/index.test.js‎

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

‎.github/workflows/e2e-dummy-gem.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
ruby-version: "3.1.7"
1818
bundler-cache: true
1919
working-directory: "test/fixtures/dummy_gem"
20-
- name: "Run easy compile"
21-
uses: "./.github/actions/easy_compile"
20+
- name: "Run cibuildgem"
21+
uses: "./.github/actions/cibuildgem"
2222
with:
2323
step: "compile"
2424
working-directory: "test/fixtures/dummy_gem"
@@ -41,8 +41,8 @@ jobs:
4141
ruby-version: "${{ matrix.rubies }}"
4242
bundler-cache: true
4343
working-directory: "test/fixtures/dummy_gem"
44-
- name: "Run easy compile"
45-
uses: "./.github/actions/easy_compile"
44+
- name: "Run cibuildgem"
45+
uses: "./.github/actions/cibuildgem"
4646
with:
4747
step: "test_${{ matrix.type }}"
4848
working-directory: "test/fixtures/dummy_gem"
@@ -61,7 +61,7 @@ jobs:
6161
uses: "ruby/setup-ruby@v1"
6262
with:
6363
ruby-version: "3.4.7"
64-
- name: "Run easy compile"
65-
uses: "./.github/actions/easy_compile"
64+
- name: "Run cibuildgem"
65+
uses: "./.github/actions/cibuildgem"
6666
with:
6767
step: "install"

‎.github/workflows/gem-compile.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
ruby-version: "3.1.7"
3232
bundler-cache: true
3333
working-directory: "test/fixtures/date"
34-
- name: "Run easy compile"
35-
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
34+
- name: "Run cibuildgem"
35+
uses: "shopify-playground/edouard-playground/.github/actions/cibuildgem@main"
3636
with:
3737
step: "compile"
3838
token: ${{ secrets.GITHUB_TOKEN }} # TODO Remove this before publishing the gem
@@ -56,8 +56,8 @@ jobs:
5656
ruby-version: "${{ matrix.rubies }}"
5757
bundler-cache: true
5858
working-directory: "test/fixtures/date"
59-
- name: "Run easy compile"
60-
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
59+
- name: "Run cibuildgem"
60+
uses: "shopify-playground/edouard-playground/.github/actions/cibuildgem@main"
6161
with:
6262
step: "test_${{ matrix.type }}"
6363
token: ${{ secrets.GITHUB_TOKEN }} # TODO Remove this before publishing the gem
@@ -75,8 +75,8 @@ jobs:
7575
uses: "ruby/setup-ruby@v1"
7676
with:
7777
ruby-version: "3.4.7"
78-
- name: "Run easy compile"
79-
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
78+
- name: "Run cibuildgem"
79+
uses: "shopify-playground/edouard-playground/.github/actions/cibuildgem@main"
8080
with:
8181
token: ${{ secrets.GITHUB_TOKEN }} # TODO Remove this before publishing the gem
8282
step: "install"
@@ -94,8 +94,8 @@ jobs:
9494
uses: "ruby/setup-ruby@v1"
9595
with:
9696
ruby-version: "3.4.7"
97-
- name: "Run easy compile"
98-
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
97+
- name: "Run cibuildgem"
98+
uses: "shopify-playground/edouard-playground/.github/actions/cibuildgem@main"
9999
with:
100100
step: "release"
101101
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
run: "bundle install"
3434
- name: "Compile when target has rake as dependency"
3535
working-directory: "test/fixtures/dummy_gem"
36-
run: "easy_compile compile"
36+
run: "cibuildgem compile"
3737
- name: "Bundle install on target gem"
3838
working-directory: "test/fixtures/dummy_gem"
3939
run: "bundle install"
4040
env:
4141
BUNDLE_GEMFILE: "Gemfile_no_rake"
4242
- name: "Compile when target gem doesn't have rake as dependency"
4343
working-directory: "test/fixtures/dummy_gem"
44-
run: "easy_compile compile"
44+
run: "cibuildgem compile"
4545
env:
4646
BUNDLE_GEMFILE: "Gemfile_no_rake"

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
/doc/
66
/pkg/
77
/spec/reports/
8-
/.github/actions/easy_compile/node_modules
8+
/.github/actions/cibuildgem/node_modules

0 commit comments

Comments
 (0)