From cd8b4303395a7b7491fafd699f268abbe64610cb Mon Sep 17 00:00:00 2001 From: trent-codecov Date: Wed, 4 Oct 2023 22:40:24 -0400 Subject: [PATCH 1/2] Use ATS docker action --- .github/workflows/ci.yml | 20 +++++++++++--------- .github/workflows/self-hosted-release-pr.yml | 2 +- .github/workflows/self-hosted-release.yml | 6 ++++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63de264c9..90b4c5faf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,11 +21,11 @@ concurrency: jobs: lint: name: Run Lint - uses: codecov/gha-workflows/.github/workflows/lint.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/lint.yml@v1.2.0 build: name: Build Worker - uses: codecov/gha-workflows/.github/workflows/build-app.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/build-app.yml@v1.2.0 secrets: inherit with: repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-worker' }} @@ -34,22 +34,24 @@ jobs: codecovstartup: name: Codecov Startup needs: build - uses: codecov/gha-workflows/.github/workflows/codecov-startup.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/codecov-startup.yml@v1.2.0 secrets: inherit ats: name: ATS needs: [build, codecovstartup] if: ${{ !github.event.pull_request.head.repo.fork && github.repository_owner == 'codecov' }} - uses: codecov/gha-workflows/.github/workflows/run-ats.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/run-ats.yml@v1.2.0 secrets: inherit with: repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-worker' }} + codecov_cli_upload_args: '--plugin pycoverage --plugin compress-pycoverage --flag onlysomelabels' + app_container_name: worker test: name: Test needs: [build, codecovstartup] - uses: codecov/gha-workflows/.github/workflows/run-tests.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/run-tests.yml@v1.2.0 secrets: inherit with: repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-worker' }} @@ -57,7 +59,7 @@ jobs: build-self-hosted: name: Build Self Hosted Worker needs: [build, test] - uses: codecov/gha-workflows/.github/workflows/self-hosted.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/self-hosted.yml@v1.2.0 secrets: inherit with: repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-worker' }} @@ -66,7 +68,7 @@ jobs: name: Push Staging Image needs: [build, test] if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'codecov' }} - uses: codecov/gha-workflows/.github/workflows/push-env.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/push-env.yml@v1.2.0 secrets: inherit with: environment: staging @@ -76,7 +78,7 @@ jobs: name: Push Production Image needs: [ build, test ] if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/production') && github.repository_owner == 'codecov' }} - uses: codecov/gha-workflows/.github/workflows/push-env.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/push-env.yml@v1.2.0 secrets: inherit with: environment: production @@ -87,7 +89,7 @@ jobs: needs: [ build-self-hosted, test ] secrets: inherit if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/production') && github.repository_owner == 'codecov' }} - uses: codecov/gha-workflows/.github/workflows/self-hosted.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/self-hosted.yml@v1.2.0 with: push_rolling: true repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-worker' }} diff --git a/.github/workflows/self-hosted-release-pr.yml b/.github/workflows/self-hosted-release-pr.yml index 3a6cfe275..1f61a7958 100644 --- a/.github/workflows/self-hosted-release-pr.yml +++ b/.github/workflows/self-hosted-release-pr.yml @@ -10,5 +10,5 @@ on: jobs: create-release-pr: name: Create PR for Release ${{ github.event.inputs.versionName }} - uses: codecov/gha-workflows/.github/workflows/create-self-hosted-pr.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/create-release-pr.yml@v1.2.0 secrets: inherit diff --git a/.github/workflows/self-hosted-release.yml b/.github/workflows/self-hosted-release.yml index 53ee5e3b0..bc67d756d 100644 --- a/.github/workflows/self-hosted-release.yml +++ b/.github/workflows/self-hosted-release.yml @@ -14,13 +14,15 @@ jobs: create-release: name: Tag Release ${{ github.head_ref }} and Push Docker image to Docker Hub if: ${{ github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') && github.repository_owner == 'codecov' }} - uses: codecov/gha-workflows/.github/workflows/create-self-hosted-release.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/create-release.yml@v1.2.0 + with: + tag_to_prepend: self-hosted- secrets: inherit push-image: needs: [create-release] if: ${{ github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') && github.repository_owner == 'codecov' }} - uses: codecov/gha-workflows/.github/workflows/self-hosted.yml@v1.0.0 + uses: codecov/gha-workflows/.github/workflows/self-hosted.yml@v1.2.0 secrets: inherit with: push_release: true From 5c50c877f31197e97eb4ffdd2fcc570492de8c4c Mon Sep 17 00:00:00 2001 From: trent-codecov Date: Wed, 4 Oct 2023 22:46:41 -0400 Subject: [PATCH 2/2] Add JQ to container --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 649e99921..1551727d2 100644 --- a/Makefile +++ b/Makefile @@ -201,7 +201,7 @@ test_env.install_cli: pip install --no-cache-dir codecov-cli test_env.container_prepare: - apk add -U curl git build-base + apk add -U curl git build-base jq make test_env.install_cli git config --global --add safe.directory /worker