Skip to content

Commit 95a11da

Browse files
committed
Updates for morphy branch after backport of GitHub Actions setup
1 parent 29b2a0a commit 95a11da

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
ruby-version:
12-
- '2.7'
12+
- '2.6'
1313
node-version:
1414
- 12
1515
test-suite:
@@ -19,10 +19,6 @@ jobs:
1919
- spec:javascript
2020
- spec:jest
2121
- spec:routes
22-
include:
23-
- ruby-version: '2.6'
24-
node-version: 12
25-
test-suite: spec
2622
services:
2723
postgres:
2824
image: manageiq/postgresql:10
@@ -39,7 +35,7 @@ jobs:
3935
PGPASSWORD: smartvm
4036
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
4137
steps:
42-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v4
4339
- name: Set up system
4440
run: bin/before_install
4541
- name: Set up Ruby
@@ -49,7 +45,7 @@ jobs:
4945
bundler-cache: true
5046
- name: Set up Node
5147
if: ${{ matrix.test-suite == 'spec:compile' || matrix.test-suite == 'spec:javascript' || matrix.test-suite == 'spec:jest' }}
52-
uses: actions/setup-node@v2
48+
uses: actions/setup-node@v4
5349
with:
5450
node-version: ${{ matrix.node-version }}
5551
cache: yarn
@@ -58,7 +54,3 @@ jobs:
5854
run: bin/setup
5955
- name: Run tests
6056
run: bundle exec rake
61-
- name: Report code coverage
62-
if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '2.7' && matrix.test-suite == 'spec' }}
63-
continue-on-error: true
64-
uses: paambaati/[email protected]

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ config/webpack/paths.json
2020
cypress/screenshots
2121
cypress/videos
2222
.DS_Store
23+
.yarn/

bin/before_install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ if [ -n "$MANAGEIQ_REPO" ]; then
2424
ln -s "$(cd "$MANAGEIQ_REPO" &>/dev/null && pwd)" "$spec_manageiq"
2525
elif [ ! -d "$spec_manageiq" ]; then
2626
echo "== Cloning manageiq sample app =="
27-
git clone https://github.com/ManageIQ/manageiq.git --branch master --depth 1 "$spec_manageiq"
27+
git clone https://github.com/ManageIQ/manageiq.git --branch morphy --depth 1 "$spec_manageiq"
2828
fi

0 commit comments

Comments
 (0)