Skip to content

Commit

Permalink
Updates for morphy branch after backport of GitHub Actions setup
Browse files Browse the repository at this point in the history
  • Loading branch information
Fryguy committed Feb 4, 2025
1 parent 29b2a0a commit 95a11da
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
14 changes: 3 additions & 11 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
fail-fast: false
matrix:
ruby-version:
- '2.7'
- '2.6'
node-version:
- 12
test-suite:
Expand All @@ -19,10 +19,6 @@ jobs:
- spec:javascript
- spec:jest
- spec:routes
include:
- ruby-version: '2.6'
node-version: 12
test-suite: spec
services:
postgres:
image: manageiq/postgresql:10
Expand All @@ -39,7 +35,7 @@ jobs:
PGPASSWORD: smartvm
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up system
run: bin/before_install
- name: Set up Ruby
Expand All @@ -49,7 +45,7 @@ jobs:
bundler-cache: true
- name: Set up Node
if: ${{ matrix.test-suite == 'spec:compile' || matrix.test-suite == 'spec:javascript' || matrix.test-suite == 'spec:jest' }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: yarn
Expand All @@ -58,7 +54,3 @@ jobs:
run: bin/setup
- name: Run tests
run: bundle exec rake
- name: Report code coverage
if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '2.7' && matrix.test-suite == 'spec' }}
continue-on-error: true
uses: paambaati/[email protected]
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ config/webpack/paths.json
cypress/screenshots
cypress/videos
.DS_Store
.yarn/
2 changes: 1 addition & 1 deletion bin/before_install
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ if [ -n "$MANAGEIQ_REPO" ]; then
ln -s "$(cd "$MANAGEIQ_REPO" &>/dev/null && pwd)" "$spec_manageiq"
elif [ ! -d "$spec_manageiq" ]; then
echo "== Cloning manageiq sample app =="
git clone https://github.com/ManageIQ/manageiq.git --branch master --depth 1 "$spec_manageiq"
git clone https://github.com/ManageIQ/manageiq.git --branch morphy --depth 1 "$spec_manageiq"
fi

0 comments on commit 95a11da

Please sign in to comment.