From 48ba96c9f6dd49f0daf44b02683326202d6903bb Mon Sep 17 00:00:00 2001 From: timdeschryver <28659384+timdeschryver@users.noreply.github.com> Date: Wed, 26 May 2021 09:04:48 +0200 Subject: [PATCH 1/3] ci: use one workflow --- .github/workflows/ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 853f8977..16269b00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,16 +3,15 @@ name: ci on: push: branches: - - main - pull_request: - types: [opened, synchronize, reopened] + - 'main' + pull_request: {} jobs: build_test_release: strategy: matrix: - os: [ubuntu-latest, windows-latest] - node-version: [12, 14] + node-version: ${{ fromJSON(github.ref == 'refs/heads/main' && '[16]' || '[12,14,16]') }} + os: ${{ fromJSON(github.ref == 'refs/heads/main' && '["ubuntu-latest"]' || '["ubuntu-latest", "windows-latest"]') }} runs-on: ${{ matrix.os }} steps: @@ -28,8 +27,8 @@ jobs: - name: test run: npm run test -- --ci --code-coverage - name: Release - if: github.repository == 'testing-library/angular-testing-library' && github.ref == 'refs/heads/main' && matrix.node-version == 14 && matrix.os == 'ubuntu-latest' + if: github.repository == 'testing-library/angular-testing-library' && github.ref == 'refs/heads/main' + run: npx semantic-release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - run: npx semantic-release From fc0b9608f1662bd04f42c6ec002b7459b8ce3e28 Mon Sep 17 00:00:00 2001 From: timdeschryver <28659384+timdeschryver@users.noreply.github.com> Date: Wed, 26 May 2021 09:39:26 +0200 Subject: [PATCH 2/3] update angular-eslint --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index d9a00217..4da647a9 100644 --- a/package.json +++ b/package.json @@ -47,9 +47,9 @@ }, "devDependencies": { "@angular-devkit/build-angular": "12.0.0", - "@angular-eslint/eslint-plugin": "~2.1.0", - "@angular-eslint/eslint-plugin-template": "~2.1.0", - "@angular-eslint/template-parser": "~2.1.0", + "@angular-eslint/eslint-plugin": "~12.0.0", + "@angular-eslint/eslint-plugin-template": "~12.0.0", + "@angular-eslint/template-parser": "~12.0.0", "@angular/cli": "12.0.0", "@angular/compiler-cli": "12.0.0", "@angular/language-service": "12.0.0", @@ -84,4 +84,4 @@ "ts-node": "9.1.1", "typescript": "4.2.4" } -} \ No newline at end of file +} From 1b2629afc102dc5c3d9b4a778e1a0f6fe4439bc9 Mon Sep 17 00:00:00 2001 From: timdeschryver <28659384+timdeschryver@users.noreply.github.com> Date: Wed, 26 May 2021 12:32:36 +0200 Subject: [PATCH 3/3] force install --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16269b00..87e99fb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: with: node-version: ${{ matrix.node-version }} - name: install - run: npm install + run: npm install --force - name: build run: npm run build -- --skip-nx-cache - name: test