Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert: reverts #1671 changes to CI workflow #1687

Merged
merged 1 commit into from
Jun 22, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
name: Node Agent CI

on:
workflow_dispatch: {}
pull_request:
types:
# Created PR
- opened
# Added commits to the PR
- synchronize
# Sometimes we need to do this to trigger a run
- reopened
# Merged the PR (check below ensures non-merge closing events don't trigger)
- closed
on: [push, pull_request, workflow_dispatch]

jobs:
lint:
if: ${{ !startsWith(github.head_ref, 'release/v') && (github.event.pull_request.merged == true || github.event.action != 'closed') }}
runs-on: ubuntu-latest

strategy:
Expand All @@ -36,7 +24,6 @@ jobs:
run: npm run lint:lockfile

ci:
if: ${{ !startsWith(github.head_ref, 'release/v') && (github.event.pull_request.merged == true || github.event.action != 'closed') }}
runs-on: ubuntu-latest

strategy:
Expand All @@ -55,7 +42,6 @@ jobs:
run: npm run unit:scripts

unit:
if: ${{ !startsWith(github.head_ref, 'release/v') && (github.event.pull_request.merged == true || github.event.action != 'closed') }}
runs-on: ubuntu-latest

strategy:
Expand Down Expand Up @@ -86,7 +72,6 @@ jobs:
path: ./coverage/esm-unit/lcov.info

integration:
if: ${{ !startsWith(github.head_ref, 'release/v') && (github.event.pull_request.merged == true || github.event.action != 'closed') }}
runs-on: ubuntu-latest

strategy:
Expand All @@ -112,7 +97,6 @@ jobs:
path: ./coverage/integration/lcov.info

versioned:
if: ${{ !startsWith(github.head_ref, 'release/v') && (github.event.pull_request.merged == true || github.event.action != 'closed') }}
runs-on: ubuntu-latest

strategy:
Expand All @@ -133,14 +117,14 @@ jobs:
if: ${{ matrix.node-version == '14.x' }}
run: TEST_CHILD_TIMEOUT=600000 npm run versioned:npm6
env:
VERSIONED_MODE: ${{ github.event.pull_request.merged == true && '--minor' || '--major' }}
VERSIONED_MODE: ${{ github.ref == 'refs/heads/main' && '--minor' || '--major' }}
JOBS: 4 # 2 per CPU seems to be the sweet spot in GHA (July 2022)
C8_REPORTER: lcovonly
- name: Run Versioned Tests (npm v7 / Node 16+)
if: ${{ matrix.node-version != '14.x' }}
run: TEST_CHILD_TIMEOUT=600000 npm run versioned:npm7
env:
VERSIONED_MODE: ${{ github.event.pull_request.merged == true && '--minor' || '--major' }}
VERSIONED_MODE: ${{ github.ref == 'refs/heads/main' && '--minor' || '--major' }}
JOBS: 4 # 2 per CPU seems to be the sweet spot in GHA (July 2022)
C8_REPORTER: lcovonly
- name: Archive Versioned Test Coverage
Expand Down