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

Merge main into releases/v2 #1947

Merged
merged 16 commits into from
Oct 13, 2023
Merged

Merge main into releases/v2 #1947

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1727de3
Add commit sha to database upload
norascheuch Oct 5, 2023
075eb6a
Use getCommitOid to get the id
norascheuch Oct 5, 2023
aed2e7f
Add commit id to params
norascheuch Oct 6, 2023
8193a92
Await commitOid
norascheuch Oct 9, 2023
e62d946
Add new param to test
norascheuch Oct 9, 2023
76a9f5c
Update changelog and version after v2.22.2
github-actions[bot] Oct 12, 2023
c1a0ad9
Update checked-in dependencies
github-actions[bot] Oct 12, 2023
5950d13
Enable sub-language file coverage in `interpret-results` too
henrymercer Oct 12, 2023
346d5c4
Test sub-language file coverage in file baseline information check
henrymercer Oct 12, 2023
761255a
Merge pull request #1943 from github/mergeback/v2.22.2-to-main-d90b8d79
henrymercer Oct 12, 2023
b584cf8
Merge pull request #1922 from github/nora/add-commit-sha-to-database-…
norascheuch Oct 12, 2023
bd32fab
Provide token when downloading from GHES API
henrymercer Oct 12, 2023
74442e0
Add changelog note
henrymercer Oct 12, 2023
34f97d7
Merge pull request #1944 from github/henrymercer/sublanguage-file-cov…
henrymercer Oct 12, 2023
82ba90b
Merge pull request #1945 from github/henrymercer/authenticate-api-url
henrymercer Oct 12, 2023
f5a984b
Update changelog for v2.22.3
github-actions[bot] Oct 13, 2023
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
Prev Previous commit
Next Next commit
Use getCommitOid to get the id
  • Loading branch information
@norascheuch
norascheuch committed Oct 5, 2023
commit 075eb6aaea99989bebdac9bdfe187ba973d11cc3
3 changes: 1 addition & 2 deletions lib/database-upload.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/database-upload.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/database-upload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as fs from "fs";

import * as actionsUtil from "./actions-util";
import { getOptionalInput } from "./actions-util";
import { getApiClient, GitHubApiDetails } from "./api-client";
import { getCodeQL } from "./codeql";
import { Config } from "./config-utils";
Expand Down Expand Up @@ -45,8 +44,9 @@ export async function uploadDatabases(
const bundledDb = await bundleDb(config, language, codeql, language);
const bundledDbSize = fs.statSync(bundledDb).size;
const bundledDbReadStream = fs.createReadStream(bundledDb);
const commitOid =
getOptionalInput("sha") || process.env["GITHUB_SHA"] || "";
const commitOid = actionsUtil.getCommitOid(
actionsUtil.getRequiredInput("checkout_path"),
);
try {
await client.request(
`POST https://uploads.github.com/repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name`,
Expand Down
Loading