Skip to content

Commit e29674d

Browse files
committed
Merge pull request #1985 from Fryguy/cleanup_for_back_merge
Cleanup files for cleaner merge backs
2 parents 33370dd + fc690f0 commit e29674d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
---
12
name: CI
2-
33
on:
44
push:
55
pull_request:
66
workflow_dispatch:
77
schedule:
8-
- cron: '0 0 * * *'
9-
8+
- cron: 0 0 * * *
109
jobs:
1110
ci:
1211
runs-on: ubuntu-latest
@@ -24,14 +23,15 @@ jobs:
2423
- name: Set up Node
2524
uses: actions/setup-node@v4
2625
with:
27-
node-version: ${{ matrix.node-version }}
28-
cache: ${{ !env.ACT && 'yarn' || '' }}
26+
node-version: "${{ matrix.node-version }}"
27+
cache: "${{ !env.ACT && 'yarn' || '' }}"
2928
registry-url: https://npm.manageiq.org/
3029
- name: Prepare tests
3130
run: bin/setup
3231
- name: Run tests
3332
run: yarn run ${{ matrix.test-suite }}
3433
- name: Report code coverage
35-
if: ${{ github.ref == 'refs/heads/master' && matrix.test-suite != 'test:security' }}
34+
if: "${{ github.ref == 'refs/heads/master' && matrix.test-suite != 'test:security'
35+
}}"
3636
continue-on-error: true
3737
run: cat reports/coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ManageIQ Service UI
22

3-
[![CI](https://github.com/ManageIQ/manageiq-ui-service/actions/workflows/ci.yaml/badge.svg)](https://github.com/ManageIQ/manageiq-ui-service/actions/workflows/ci.yaml)
3+
[![CI](https://github.com/ManageIQ/manageiq-ui-service/actions/workflows/ci.yaml/badge.svg?branch=master)](https://github.com/ManageIQ/manageiq-ui-service/actions/workflows/ci.yaml)
44
[![Coverage Status](https://coveralls.io/repos/github/ManageIQ/manageiq-ui-service/badge.svg?branch=master)](https://coveralls.io/github/ManageIQ/manageiq-ui-service?branch=master)
55
[![Code Climate](https://codeclimate.com/github/ManageIQ/manageiq-ui-service/badges/gpa.svg)](https://codeclimate.com/github/ManageIQ/manageiq-ui-service)
66

0 commit comments

Comments
 (0)