Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions .github/actions/easy_compile/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ inputs:
step:
description: "The step to run"
required: true
token:
description: "TODO this is needed to install the Easy Compile gem from the GitHub repo. Can be removed "
required: false
test-command:
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."
required: false
Expand All @@ -20,16 +17,10 @@ inputs:
runs:
using: "composite"
steps:
- name: Checkout easy compile # TODO this can be removed once this tool is pusblished on RubyGems
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
with:
path: "tmp"
repository: "shopify-playground/edouard-playground"
token: ${{ inputs.token }}
- name: Install easy compile # TODO this can be removed once this tool is pusblished on RubyGems
shell: bash
run: "rake install"
working-directory: "tmp"
working-directory: "${{ github.action_path }}"
- name: "Setup Rake Compiler"
if: "${{ inputs.step == 'compile' }}"
uses: actions/github-script@v8
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/e2e-dummy-gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
uses: "./.github/actions/easy_compile"
with:
step: "compile"
token: ${{ secrets.GITHUB_TOKEN }}
working-directory: "test/fixtures/dummy_gem"
test:
timeout-minutes: 20
Expand All @@ -46,7 +45,6 @@ jobs:
uses: "./.github/actions/easy_compile"
with:
step: "test_${{ matrix.type }}"
token: ${{ secrets.GITHUB_TOKEN }} # TODO Remove this before publishing the gem
working-directory: "test/fixtures/dummy_gem"
install:
timeout-minutes: 5
Expand All @@ -66,5 +64,4 @@ jobs:
- name: "Run easy compile"
uses: "./.github/actions/easy_compile"
with:
token: ${{ secrets.GITHUB_TOKEN }} # TODO Remove this before publishing the gem
step: "install"
5 changes: 5 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ jobs:
- name: "Compile when target has rake as dependency"
working-directory: "test/fixtures/dummy_gem"
run: "easy_compile compile"
- name: "Bundle install on target gem"
working-directory: "test/fixtures/dummy_gem"
run: "bundle install"
env:
BUNDLE_GEMFILE: "Gemfile_no_rake"
- name: "Compile when target gem doesn't have rake as dependency"
working-directory: "test/fixtures/dummy_gem"
run: "easy_compile compile"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "compile"
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
<%- if options['working-directory'] -%>
working-directory: "<%= options['working-directory'] %>"
<%- end -%>
Expand Down Expand Up @@ -59,7 +58,6 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "test_${{ matrix.type }}"
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
<%- if options['working-directory'] -%>
working-directory: "<%= options['working-directory'] %>"
<%- end -%>
Expand All @@ -82,7 +80,6 @@ jobs:
- name: "Run easy compile"
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
step: "install"
release:
permissions:
Expand All @@ -102,4 +99,3 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "release"
token: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions test/fixtures/dummy_gem/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Gemfile.lock
Gemfile_no_rake.lock
lib/*.bundle
tmp/
20 changes: 0 additions & 20 deletions test/fixtures/dummy_gem/Gemfile_no_rake.lock

This file was deleted.

4 changes: 0 additions & 4 deletions test/fixtures/expected_github_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "compile"
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
test:
timeout-minutes: 20
name: "Run the test suite"
Expand All @@ -50,7 +49,6 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "test_${{ matrix.type }}"
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
install:
timeout-minutes: 5
name: "Verify the gem can be installed"
Expand All @@ -67,7 +65,6 @@ jobs:
- name: "Run easy compile"
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
step: "install"
release:
permissions:
Expand All @@ -87,4 +84,3 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "release"
token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 0 additions & 4 deletions test/fixtures/expected_github_workflow_test_and_workdir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "compile"
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
working-directory: "foo/bar"
test:
timeout-minutes: 20
Expand All @@ -53,7 +52,6 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "test_${{ matrix.type }}"
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
working-directory: "foo/bar"
test-command: "bundle exec something"
install:
Expand All @@ -72,7 +70,6 @@ jobs:
- name: "Run easy compile"
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
step: "install"
release:
permissions:
Expand All @@ -92,4 +89,3 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "release"
token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 0 additions & 4 deletions test/fixtures/expected_github_workflow_test_command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "compile"
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
test:
timeout-minutes: 20
name: "Run the test suite"
Expand All @@ -50,7 +49,6 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "test_${{ matrix.type }}"
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
test-command: "bundle exec something"
install:
timeout-minutes: 5
Expand All @@ -68,7 +66,6 @@ jobs:
- name: "Run easy compile"
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
step: "install"
release:
permissions:
Expand All @@ -88,4 +85,3 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "release"
token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 0 additions & 4 deletions test/fixtures/expected_github_workflow_working_dir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "compile"
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
working-directory: "test/fixtures/date"
test:
timeout-minutes: 20
Expand All @@ -53,7 +52,6 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "test_${{ matrix.type }}"
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
working-directory: "test/fixtures/date"
install:
timeout-minutes: 5
Expand All @@ -71,7 +69,6 @@ jobs:
- name: "Run easy compile"
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
token: ${{ secrets.EASY_COMPILE }} # TODO Remove this before publishing the gem
step: "install"
release:
permissions:
Expand All @@ -91,4 +88,3 @@ jobs:
uses: "shopify-playground/edouard-playground/.github/actions/easy_compile@main"
with:
step: "release"
token: ${{ secrets.GITHUB_TOKEN }}