Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable coverage for PRs #17204

Merged
merged 14 commits into from
Nov 8, 2024
Merged

enable coverage for PRs #17204

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d3b5919
enable coverage for PRs
tgummerer Sep 9, 2024
2d2e49d
always build codegen tests on PR
tgummerer Sep 9, 2024
25d72dd
try something
tgummerer Sep 16, 2024
ad16aca
base
tgummerer Sep 16, 2024
8b3af9f
try something else
tgummerer Sep 19, 2024
9c2db76
try yet anothr thing
tgummerer Sep 26, 2024
2ebc941
more experiments
tgummerer Sep 27, 2024
36445c9
testing
tgummerer Sep 27, 2024
9bbe820
simplify
tgummerer Sep 27, 2024
f4be106
use tip of PR
tgummerer Oct 7, 2024
b62a8e2
set codecov pr dase manually again
tgummerer Nov 4, 2024
09f34fa
fix ref some more
tgummerer Nov 4, 2024
d82d325
update comment
tgummerer Nov 7, 2024
a3a1742
set codecov base only on PRs
tgummerer Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ jobs:
test-name: ${{ matrix.test-suite.name || matrix.test-suite.command }} on ${{ matrix.platform }}/${{ matrix.version-set.name }}
test-command: ${{ matrix.test-suite.command }}
is-integration-test: true
enable-coverage: ${{ inputs.enable-coverage }}
enable-coverage: false
test-retries: ${{ inputs.test-retries }}
# require-build: false # TODO, remove ${{ matrix.require-build || false }}

Expand All @@ -419,7 +419,7 @@ jobs:
test-name: ${{ matrix.test-suite.name || matrix.test-suite.command }} on ${{ matrix.platform }}/${{ matrix.version-set.name }}
test-command: ${{ matrix.test-suite.command }}
is-integration-test: true
enable-coverage: ${{ inputs.enable-coverage }}
enable-coverage: false
test-retries: ${{ inputs.test-retries }}
# require-build: false # TODO, remove ${{ matrix.require-build || false }}

Expand Down Expand Up @@ -448,7 +448,7 @@ jobs:
ls -lhR test-results
find test-results -mindepth 1 -name '*.json' -mtime +7 -delete
test-collect-coverage:
needs: [unit-test, integration-test, acceptance-test-macos]
needs: [unit-test, integration-test]
if: ${{ inputs.enable-coverage }}
runs-on: ubuntu-latest
steps:
Expand All @@ -472,6 +472,11 @@ jobs:
pattern: coverage-*
merge-multiple: true
path: coverage
- name: Set codecov PR base
run: |
curl -Os https://cli.codecov.io/latest/linux/codecov
sudo chmod +x codecov
./codecov pr-base-picking --base-sha "$(git merge-base origin/master HEAD)" --pr ${{ github.event.number }} --slug pulumi/pulumi --token ${{ secrets.CODECOV_TOKEN }} --service github
- name: Upload code coverage
uses: codecov/codecov-action@v4
with:
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/on-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- "sdk/.version"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

# The jobs in this workflow are only run on branches. The `on-community-pr.yml` job provides
Expand All @@ -28,7 +28,7 @@ jobs:
permissions:
contents: read
with:
ref: ${{ github.ref }}
ref: ${{ github.head_ref }}
is-snapshot: true
secrets: inherit

Expand Down Expand Up @@ -67,17 +67,13 @@ jobs:
# To sign artifacts.
id-token: write
with:
ref: ${{ github.ref }}
ref: ${{ github.head_ref }}
version: ${{ needs.info.outputs.version }}
lint: true
# codegen tests take quite a while to run.
# Run them only if ci/test is set,
# or if one of the codegen files changed.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this comment outdated now?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, good catch! I've updated it now.

test-codegen: >- # No newlines or trailing newline.
${{
contains(github.event.pull_request.labels.*.name, 'ci/test') ||
(needs.inspect.outputs.test-codegen == 'true')
}}
test-codegen: true
test-version-sets: >- # No newlines or trailing newline.
${{
contains(github.event.pull_request.labels.*.name, 'ci/test')
Expand All @@ -91,8 +87,7 @@ jobs:
&& 'macos-latest windows-latest'
|| 'windows-latest'
}}
# We'll only upload coverage artifacts with the periodic-coverage cron workflow.
enable-coverage: false
enable-coverage: true
secrets: inherit

performance-gate:
Expand Down
Loading