From 91a88392c2ef87088866815d6db82b6a2be6aef3 Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Fri, 31 Jul 2020 13:57:17 -0700 Subject: [PATCH] fix kotsadm web tests in github action (#892) --- .github/workflows/build-test.yaml | 2 +- .github/workflows/kotsadm.yaml | 14 +++++++++++--- kotsadm/web/Makefile | 4 ++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index fc7c82e5d0..4c01affda9 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -102,10 +102,10 @@ jobs: - run: chmod +x bin/kots - - uses: actions/setup-node@v1 with: node-version: '10.x' + - name: setup testIM run: npm i -g @testim/testim-cli shell: bash diff --git a/.github/workflows/kotsadm.yaml b/.github/workflows/kotsadm.yaml index 6389a4eec8..91bd781226 100644 --- a/.github/workflows/kotsadm.yaml +++ b/.github/workflows/kotsadm.yaml @@ -134,15 +134,23 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + + - name: Setup Node.js environment + uses: actions/setup-node@v2.1.1 + with: + node-version: '10' + + - name: Install cross-env + run: npm i -g cross-env + shell: bash - name: Test web env: PACT_BROKER_USERNAME: ${{ secrets.PACT_BROKER_USERNAME }} PACT_BROKER_PASSWORD: ${{ secrets.PACT_BROKER_PASSWORD }} run: | - # TODO: Remove '|| true' when web test works - make -C kotsadm/web deps test || true - yarn run publish:pact || true + make -C kotsadm/web deps test publish-pact + # TODO: migrate retry logic for pacts # retry: # automatic: diff --git a/kotsadm/web/Makefile b/kotsadm/web/Makefile index d153bd2e12..aabe6671f4 100644 --- a/kotsadm/web/Makefile +++ b/kotsadm/web/Makefile @@ -13,6 +13,10 @@ endif deps: yarn --silent --frozen-lockfile +.PHONY: publish-pact +publish-pact: + yarn run publish:pact + .PHONY: clean clean: rm -rf node_modules