From 1f263857a0d3c7dd74360bbbefd3f9cff0c6078f Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Thu, 2 Mar 2023 16:05:59 -0500 Subject: [PATCH] Add testing to default and release branches Also added a note to the circleci config Signed-off-by: Matt Farina --- .circleci/config.yml | 3 +++ .github/workflows/{build-pr.yml => build-test.yml} | 6 +++++- .github/workflows/release.yml | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) rename .github/workflows/{build-pr.yml => build-test.yml} (94%) diff --git a/.circleci/config.yml b/.circleci/config.yml index f50094be33e..b377a086c0f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,7 @@ --- + +# This file can be removed when Helm no longer uses CircleCI on any release +# branches. Once CircleCI is turned off this file can be removed. version: 2 jobs: diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-test.yml similarity index 94% rename from .github/workflows/build-pr.yml rename to .github/workflows/build-test.yml index af0a7487e2e..1c0742c8ce0 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-test.yml @@ -1,5 +1,9 @@ -name: build-pr +name: build-test on: + push: + branches: + - 'main' + - 'release-**' pull_request: branches: - main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8d1c991602a..42039e97371 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,6 +24,9 @@ jobs: uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@3.5.0 with: go-version: '1.18' + + - name: Run unit tests + run: make test-coverage - name: Build Helm Binaries run: | @@ -53,6 +56,9 @@ jobs: with: go-version: '1.18' + - name: Run unit tests + run: make test-coverage + - name: Build Helm Binaries run: | make build-cross