Skip to content

Commit

Permalink
Merge pull request #4 from fritx/ci/drop-node6
Browse files Browse the repository at this point in the history
Drop node6 from CI e2e-test due to unknown bug in npm cli
  • Loading branch information
Jayin authored Jan 22, 2024
2 parents e5fec2a + 2b11156 commit 8efc767
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
node-version:
# trying to pick up the lowest versions within the supported options
# https://github.com/actions/node-versions/blob/main/versions-manifest.json
- 6
# - 6
- 8
# - 10 # skip
- 10 # skip
# - 12 # skip
# - 14 # skip
os:
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
node -e "assert.equal(fs.readFileSync('tmp.json','utf8'), fs.readFileSync('result.json','utf8'))"
- name: Test Jsonc
# current jsonc implementation requires node>=8
if: matrix.node-version == 8
if: matrix.node-version >= 8
run: |
cd test/fixtures
jsonmerge --jsonc jsonc/*.json > tmp.jsonc
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,14 @@ jobs:
run: npm run test:cov

- name: Update Coverage Badge
if: ${{ matrix.os == 'ubuntu-22.04' && matrix.node-version == 18 }}
# Is there a way to tell if a PR is from a forked repository? #26829
# https://github.com/orgs/community/discussions/26829#discussioncomment-3253580
if: >-
matrix.os == 'ubuntu-22.04' && matrix.node-version == 18 && ((
github.event_name == 'pull_request' &&
github.event.pull_request.head.repo.full_name == github.repository
) || (
github.event_name == 'pull_request_target' &&
github.event.pull_request.head.repo.full_name != github.repository
))
uses: we-cli/coverage-badge-action@main

0 comments on commit 8efc767

Please sign in to comment.