Skip to content

Commit 4896f55

Browse files
committed
merge main into dana/commit-report-upload-args
2 parents 5babcaf + e1dd05c commit 4896f55

14 files changed

Lines changed: 347 additions & 113 deletions

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ jobs:
3737

3838
steps:
3939
- name: Checkout repository
40-
uses: actions/checkout@v3
40+
uses: actions/checkout@v3.5.3
4141

4242
# Initializes the CodeQL tools for scanning.
4343
- name: Initialize CodeQL
44-
uses: github/codeql-action/init@v2
44+
uses: github/codeql-action/init@v2.21.2
4545
with:
4646
languages: ${{ matrix.language }}
4747
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
5252
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5353
# If this step fails, then you should remove it and run the build manually (see below)
5454
- name: Autobuild
55-
uses: github/codeql-action/autobuild@v2
55+
uses: github/codeql-action/autobuild@v2.21.2
5656

5757
# ℹ️ Command-line programs to run using the OS shell.
5858
# 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
6666
# make release
6767

6868
- name: Perform CodeQL Analysis
69-
uses: github/codeql-action/analyze@v2
69+
uses: github/codeql-action/analyze@v2.21.2

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
os: [macos-latest, windows-latest, ubuntu-latest]
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v3.5.3
1212
- name: Upload coverage to Codecov (script)
1313
uses: ./
1414
with:
@@ -40,7 +40,7 @@ jobs:
4040
os: [macos-latest, windows-latest, ubuntu-latest]
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v3.5.3
4444
- name: Install dependencies
4545
run: npm install
4646
- name: Lint

.github/workflows/scorecards-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424

2525
steps:
2626
- name: "Checkout code"
27-
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0
27+
uses: actions/checkout@v3.5.3 # v3.0.0
2828
with:
2929
persist-credentials: false
3030

3131
- name: "Run analysis"
32-
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
32+
uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
3333
with:
3434
results_file: results.sarif
3535
results_format: sarif
@@ -56,6 +56,6 @@ jobs:
5656

5757
# Upload the results to GitHub's code scanning dashboard.
5858
- name: "Upload to code-scanning"
59-
uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # v1.0.26
59+
uses: github/codeql-action/upload-sarif@v2.21.2 # v1.0.26
6060
with:
6161
sarif_file: results.sarif

CHANGELOG.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,57 @@
1+
## 3.1.4
2+
### Fixes
3+
- #967 Fix typo in README.md
4+
- #971 fix: add back in working dir
5+
- #969 fix: CLI option names for uploader
6+
7+
### Dependencies
8+
- #970 build(deps-dev): bump @types/node from 18.15.12 to 18.16.3
9+
- #979 build(deps-dev): bump @types/node from 20.1.0 to 20.1.2
10+
- #981 build(deps-dev): bump @types/node from 20.1.2 to 20.1.4
11+
12+
## 3.1.3
13+
### Fixes
14+
- #960 fix: allow for aarch64 build
15+
16+
### Dependencies
17+
- #957 build(deps-dev): bump jest-junit from 15.0.0 to 16.0.0
18+
- #958 build(deps): bump openpgp from 5.7.0 to 5.8.0
19+
- #959 build(deps-dev): bump @types/node from 18.15.10 to 18.15.12
20+
21+
## 3.1.2
22+
### Fixes
23+
- #718 Update README.md
24+
- #851 Remove unsupported path_to_write_report argument
25+
- #898 codeql-analysis.yml
26+
- #901 Update README to contain correct information - inputs and negate feature
27+
- #955 fix: add in all the extra arguments for uploader
28+
29+
### Dependencies
30+
- #819 build(deps): bump openpgp from 5.4.0 to 5.5.0
31+
- #835 build(deps): bump node-fetch from 3.2.4 to 3.2.10
32+
- #840 build(deps): bump ossf/scorecard-action from 1.1.1 to 2.0.4
33+
- #841 build(deps): bump @actions/core from 1.9.1 to 1.10.0
34+
- #843 build(deps): bump @actions/github from 5.0.3 to 5.1.1
35+
- #869 build(deps): bump node-fetch from 3.2.10 to 3.3.0
36+
- #872 build(deps-dev): bump jest-junit from 13.2.0 to 15.0.0
37+
- #879 build(deps): bump decode-uri-component from 0.2.0 to 0.2.2
38+
- #889 build(deps): bump ossf/scorecard-action from 1.1.1 to 2.1.2
39+
- #895 build(deps): bump json5 from 2.2.1 to 2.2.3
40+
- #896 build(deps): bump actions/upload-artifact from 3.1.0 to 3.1.2
41+
- #900 build(deps-dev): bump @vercel/ncc from 0.34.0 to 0.36.1
42+
- #905 build(deps-dev): bump typescript from 4.7.4 to 4.9.5
43+
- #911 build(deps-dev): bump @types/node from 16.11.40 to 18.13.0
44+
- #922 build(deps-dev): bump @types/node from 18.13.0 to 18.14.0
45+
- #924 build(deps): bump openpgp from 5.5.0 to 5.7.0
46+
- #927 build(deps-dev): bump @types/node from 18.14.0 to 18.14.2
47+
- #933 build(deps-dev): bump @types/node from 18.14.2 to 18.14.6
48+
- #937 build(deps-dev): bump @types/node from 18.14.6 to 18.15.0
49+
- #938 build(deps): bump node-fetch from 3.3.0 to 3.3.1
50+
- #945 build(deps-dev): bump @types/node from 18.15.0 to 18.15.5
51+
- #946 build(deps-dev): bump @types/node from 18.15.5 to 18.15.6
52+
- #947 build(deps-dev): bump @types/node from 18.15.6 to 18.15.10
53+
- #951 build(deps): bump ossf/scorecard-action from 2.1.2 to 2.1.3
54+
155
## 3.1.1
256
### Fixes
357
- #661 Update deprecation warning

README.md

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ steps:
3535
- uses: actions/checkout@master
3636
- uses: codecov/codecov-action@v3
3737
with:
38-
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
38+
token: ${{ secrets.CODECOV_TOKEN }}
3939
files: ./coverage1.xml,./coverage2.xml # optional
4040
flags: unittests # optional
4141
name: codecov-umbrella # optional
@@ -50,35 +50,44 @@ Codecov's Action supports inputs from the user. These inputs, along with their d
5050

5151
| Input | Description | Usage |
5252
| :---: | :---: | :---: |
53-
| `token` | Used to authorize coverage report uploads | *Required for private repos* |
54-
| `files` | Comma-separated paths to the coverage report(s). Negated paths are supported by starting with `!` | Optional
55-
| `directory` | Directory to search for coverage reports. | Optional
56-
| `dry_run` | Don't upload files to Codecov | Optional
57-
| `flags` | Flag the upload to group coverage metrics (unittests, uitests, etc.). Multiple flags are separated by a comma (ui,chrome) | Optional
53+
| `token` | Used to authorize coverage report uploads | *Required |
54+
| `move_coverage_to_trash` | Move discovered coverage reports to the trash | Optional
5855
| `commit_parent` | The commit SHA of the parent for which you are uploading coverage. If not present, the parent will be determined using the API of your repository provider. When using the repository provider's API, the parent is determined via finding the closest ancestor to the commit. | Optional
56+
| `dry_run` | Don't upload files to Codecov | Optional
5957
| `env_vars` | Environment variables to tag the upload with. Multiple env variables can be separated with commas (e.g. `OS,PYTHON`) | Optional
6058
| `fail_ci_if_error` | Specify if CI pipeline should fail when Codecov runs into errors during upload. *Defaults to **false*** | Optional
59+
| `files` | Comma-separated paths to the coverage report(s). Negated paths are supported by starting with `!` | Optional
60+
| `flags` | Flag the upload to group coverage metrics (unittests, uitests, etc.). Multiple flags are separated by a comma (ui,chrome) | Optional
61+
| `full_report` | Specify the path of a full Codecov report to re-upload | Optional
6162
| `functionalities` | Toggle functionalities | Optional
62-
| `network` | Disable uploading the file network | Optional
63+
| -- `network` | Disable uploading the file network | Optional
64+
| -- `fixes` | Enable file fixes to ignore common lines from coverage | Optional
65+
| -- `search` | Disable searching for coverage files | Optional
6366
| `gcov` | Run with gcov support | Optional
6467
| `gcov_args` | Extra arguments to pass to gcov | Optional
6568
| `gcov_ignore` | Paths to ignore during gcov gathering | Optional
6669
| `gcov_include` | Paths to include during gcov gathering | Optional
67-
| `move_coverage_to_trash` | Move discovered coverage reports to the trash | Optional
70+
| `gcov_executable` | gcov executable to run. Defaults to gcov. | Optional
6871
| `name` | Custom defined name for the upload | Optional
72+
| `network_filter` | Specify a filter on the files listed in the network section of the Codecov report. Useful for upload-specific path fixing | Optional
73+
| `network_prefix` | Specify a prefix on files listed in the network section of the Codecov report. Useful to help resolve path fixing | Optional
74+
| `os` | Specify the OS (linux, macos, windows, alpine) | Optional
6975
| `override_branch` | Specify the branch name | Optional
7076
| `override_build` | Specify the build number | Optional
7177
| `override_commit` | Specify the commit SHA | Optional
7278
| `override_pr` | Specify the pull request number | Optional
7379
| `override_tag` | Specify the git tag | Optional
7480
| `root_dir` | Used when not in git/hg project to identify project root directory | Optional
81+
| `directory` | Directory to search for coverage reports. | Optional
7582
| `slug` | Specify the slug manually (Enterprise use) | Optional
83+
| `swift` | Run with swift coverage support | Optional
84+
| -- `swift_project` | Specify the swift project to speed up coverage conversion | Optional
85+
| `upstream_proxy` | The upstream http proxy server to connect through | Optional
7686
| `url` | Change the upload host (Enterprise use) | Optional
7787
| `verbose` | Specify whether the Codecov output should be verbose | Optional
7888
| `version` | Specify which version of the Codecov Uploader should be used. Defaults to `latest` | Optional
7989
| `working-directory` | Directory in which to execute `codecov.sh` | Optional
80-
| `xcode` | Run with xcode support | Optional
81-
| `xcode_archive_path` | Specify the xcode archive path. Likely specified as the -resultBundlePath and should end in .xcresult | Optional
90+
| `xtra_args` | Add additional uploader args that may be missing in the Action | Optional
8291

8392

8493
### Example `workflow.yml` with Codecov Action
@@ -94,13 +103,13 @@ jobs:
94103
os: [ubuntu-latest, macos-latest, windows-latest]
95104
env:
96105
OS: ${{ matrix.os }}
97-
PYTHON: '3.7'
106+
PYTHON: '3.10'
98107
steps:
99108
- uses: actions/checkout@master
100109
- name: Setup Python
101110
uses: actions/setup-python@master
102111
with:
103-
python-version: 3.7
112+
python-version: 3.10
104113
- name: Generate coverage report
105114
run: |
106115
pip install pytest

action.yml

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ inputs:
55
token:
66
description: 'Repository upload token - get it from codecov.io. Required only for private repositories'
77
required: false
8+
file:
9+
description: 'Path to coverage file to upload'
10+
required: false
811
files:
912
description: 'Comma-separated list of files to upload'
1013
required: false
@@ -14,6 +17,9 @@ inputs:
1417
flags:
1518
description: 'Flag upload to group coverage metrics (e.g. unittests | integration | ui,chrome)'
1619
required: false
20+
full_report:
21+
description: Specify the path of a full Codecov report to re-upload
22+
required: false
1723
commit_parent:
1824
description: 'The commit SHA of the parent for which you are uploading coverage. If not present, the parent will be determined using the API of your repository provider. When using the repository providers API, the parent is determined via finding the closest ancestor to the commit.'
1925
required: false
@@ -26,18 +32,18 @@ inputs:
2632
fail_ci_if_error:
2733
description: 'Specify whether or not CI build should fail if Codecov runs into an error during upload'
2834
required: false
29-
file:
30-
description: 'Path to coverage file to upload'
31-
required: false
3235
functionalities:
33-
description: 'Comma-separated list, see the README for options and their usage'
36+
description: 'Comma-separated list, see the README for options and their usage. Options include `network`, `fixes`, `search`.'
3437
required: false
3538
gcov:
3639
description: 'Run with gcov support'
3740
required: false
3841
gcov_args:
3942
description: 'Extra arguments to pass to gcov'
4043
required: false
44+
gcov_executable:
45+
description: 'gcov executable to run. Defaults to gcov'
46+
required: false
4147
gcov_ignore:
4248
description: 'Paths to ignore during gcov gathering'
4349
required: false
@@ -50,6 +56,15 @@ inputs:
5056
name:
5157
description: 'User defined upload name. Visible in Codecov UI'
5258
required: false
59+
network_filter:
60+
description: 'Specify a filter on the files listed in the network section of the Codecov report. Useful for upload-specific path fixing'
61+
required: false
62+
network_prefix:
63+
description: 'Specify a prefix on files listed in the network section of the Codecov report. Useful to help resolve path fixing'
64+
required: false
65+
os:
66+
description: 'Override the assumed OS. Options are aarch64 | alpine | linux | macos | windows.'
67+
required: false
5368
override_branch:
5469
description: 'Specify the branch name'
5570
required: false
@@ -65,15 +80,21 @@ inputs:
6580
override_tag:
6681
description: 'Specify the git tag'
6782
required: false
68-
os:
69-
description: 'Override the assumed OS. Options are alpine | linux | macos | windows.'
70-
required: false
7183
root_dir:
7284
description: 'Used when not in git/hg project to identify project root directory'
7385
required: false
7486
slug:
7587
description: 'Specify the slug manually (Enterprise use)'
7688
required: false
89+
swift:
90+
description: 'Run with swift coverage support'
91+
required: false
92+
swift_project:
93+
description: 'Specify the swift project to speed up coverage conversion'
94+
required: false
95+
upstream_proxy:
96+
description: 'The upstream http proxy server to connect through'
97+
required: false
7798
url:
7899
description: 'Change the upload host (Enterprise use)'
79100
required: false
@@ -92,6 +113,9 @@ inputs:
92113
xcode_archive_path:
93114
description: 'Specify the xcode archive path. Likely specified as the -resultBundlePath and should end in .xcresult'
94115
required: false
116+
xtra_args:
117+
description: 'Add additional uploader args that may be missing in the Action'
118+
required: false
95119
branding:
96120
color: 'red'
97121
icon: 'umbrella'

0 commit comments

Comments
 (0)