From 05ea042d7e7f9663122636f187b1252cf191518a Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Sat, 23 Mar 2024 22:34:57 -0700 Subject: [PATCH] [actions] consolidate --- .github/workflows/node-4+.yml | 5 ++- .github/workflows/node-tests-only.yml | 55 --------------------------- 2 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 .github/workflows/node-tests-only.yml diff --git a/.github/workflows/node-4+.yml b/.github/workflows/node-4+.yml index 2925adda8a..ad6faa9909 100644 --- a/.github/workflows/node-4+.yml +++ b/.github/workflows/node-4+.yml @@ -22,11 +22,14 @@ jobs: latest: needs: [matrix] name: 'majors' - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: + os: + - ubuntu-latest + - macos-latest node-version: ${{ fromJson(needs.matrix.outputs.latest) }} eslint: - 8 diff --git a/.github/workflows/node-tests-only.yml b/.github/workflows/node-tests-only.yml deleted file mode 100644 index 80c5fbedee..0000000000 --- a/.github/workflows/node-tests-only.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Node.js tests-only - -on: - [push, pull_request] - -jobs: - testonly: - runs-on: ${{ matrix.os }} - - strategy: - matrix: - os: [ubuntu-latest, macos-latest] - node_version: [14, 12, 10, 8, 6, 4] - eslint_version: [5, 4, 3, 2] - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup NVM - run: | - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash - - - name: Setup Node.js ${{ matrix.node_version }} - run: | - source ~/.nvm/nvm.sh - nvm install ${{ matrix.node_version }} - - - name: Install latest npm for given node version - run: | - source ~/.nvm/nvm.sh - nvm install-latest-npm - - - name: Install npm dependencies - env: - ESLINT_VERSION: ${{ matrix.eslint_version }} - run: | - NPM_CONFIG_LEGACY_PEER_DEPS=true npm install - npm run copy-metafiles - - - name: Install specific eslint version - if: ${{ matrix.eslint_version != null }} - env: - ESLINT_VERSION: ${{ matrix.eslint_version }} - run: | - NPM_CONFIG_LEGACY_PEER_DEPS=true npm install - ./tests/dep-time-travel.sh - npm run pretest - - - name: Run tests - run: npm run tests-only - - - name: Upload coverage report to Codecov - uses: codecov/codecov-action@v4 -