Skip to content

Commit fa12563

Browse files
authored
Fix deploy preflight and add test matrix for mac/ubuntu (#6)
1 parent 9fc8ab7 commit fa12563

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

.github/workflows/cli_deploy.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@ jobs:
2626
bundle install
2727
2828
- name: Build and install gem locally
29-
run: bundle exec rake install
29+
run: |
30+
bundle exec rake build
31+
gem install pkg/*.gem
3032
3133
- name: Test emerge CLI
3234
run: |
33-
export PATH="$(ruby -e 'puts Gem.user_dir')/bin:$PATH"
35+
# Update PATH to include both system and user gem paths
36+
export PATH="$(ruby -e 'puts Gem.user_dir')/bin:$(ruby -e 'puts Gem.dir')/bin:$PATH"
37+
3438
OUTPUT=$(emerge -h 2>&1 || true)
3539
echo "$OUTPUT"
3640

.github/workflows/cli_tests.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ on:
77
branches: [main]
88

99
jobs:
10-
rubocop:
11-
name: Rubocop
10+
lint:
11+
name: Lint
1212
runs-on: ubuntu-latest
13-
1413
steps:
1514
- uses: actions/checkout@v4
1615

17-
- name: Set up Ruby and install dependencies
16+
- name: Set up Ruby
1817
uses: ruby/setup-ruby@v1
1918
with:
2019
ruby-version: '3.2.2'
@@ -23,16 +22,21 @@ jobs:
2322
- name: Run Rubocop
2423
run: bundle exec rubocop --parallel
2524

26-
minitest:
27-
name: Minitest
28-
runs-on: ubuntu-latest
25+
test:
26+
name: Test
27+
strategy:
28+
matrix:
29+
os: [ubuntu-latest, macos-latest]
30+
ruby-version: ['3.2.2']
31+
runs-on: ${{ matrix.os }}
32+
2933
steps:
3034
- uses: actions/checkout@v4
3135

32-
- name: Set up Ruby and install dependencies
36+
- name: Set up Ruby
3337
uses: ruby/setup-ruby@v1
3438
with:
35-
ruby-version: '3.2.2'
39+
ruby-version: ${{ matrix.ruby-version }}
3640
bundler-cache: true
3741

3842
- name: Run Minitest tests

0 commit comments

Comments
 (0)