From e5ecc7fbefd2401f06e4265462d2f897afba222b Mon Sep 17 00:00:00 2001 From: nlf Date: Thu, 26 Jan 2023 11:57:41 -0800 Subject: [PATCH] chore: remove unnecessary release-integration workflow --- .github/workflows/release-integration.yml | 41 ------------------- .github/workflows/release.yml | 10 ++++- .../template-oss/_job-release-integration.yml | 10 ++++- 3 files changed, 18 insertions(+), 43 deletions(-) delete mode 100644 .github/workflows/release-integration.yml diff --git a/.github/workflows/release-integration.yml b/.github/workflows/release-integration.yml deleted file mode 100644 index 23b39ecd2dcb9..0000000000000 --- a/.github/workflows/release-integration.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: release integration - -on: - workflow_call: - inputs: - npmVersion: - description: npm version to test - type: string - required: true - installFlags: - description: 'extra flags to pass to npm install' - required: false - type: string - default: '' - workflow_dispatch: - inputs: - npmVersion: - description: npm version to test - type: string - required: true - installFlags: - description: 'extra flags to pass to npm install' - required: false - type: string - default: '' - -jobs: - node-integration: - name: nodejs@${{ matrix.nodeVersion }} integration - strategy: - fail-fast: false - matrix: - nodeVersion: - - 18 - - 19 - - nightly - uses: ./.github/workflows/node-integration.yml - with: - nodeVersion: ${{ matrix.nodeVersion }} - npmVersion: ${{ inputs.npmVersion }} - installFlags: ${{ inputs.installFlags }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 487156d995ebc..2f95160d99443 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -303,8 +303,16 @@ jobs: needs: release name: Release Integration if: needs.release.outputs.release - uses: ./.github/workflows/release-integration.yml + strategy: + fail-fast: false + matrix: + nodeVersion: + - 18 + - 19 + - nightly + uses: ./.github/workflows/node-integration.yml with: + nodeVersion: ${{ matrix.nodeVersion }} npmVersion: ${{ fromJSON(needs.release.outputs.release).version }} post-release-integration: diff --git a/scripts/template-oss/_job-release-integration.yml b/scripts/template-oss/_job-release-integration.yml index e72ee3c9895fa..3c10d74525bce 100644 --- a/scripts/template-oss/_job-release-integration.yml +++ b/scripts/template-oss/_job-release-integration.yml @@ -1,3 +1,11 @@ -uses: ./.github/workflows/release-integration.yml +strategy: + fail-fast: false + matrix: + nodeVersion: + - 18 + - 19 + - nightly +uses: ./.github/workflows/node-integration.yml with: + nodeVersion: $\{{ matrix.nodeVersion }} npmVersion: $\{{ fromJSON(needs.release.outputs.release).version }}