Skip to content

Commit

Permalink
Clarify description of registries input
Browse files Browse the repository at this point in the history
  • Loading branch information
aeisenberg committed Sep 6, 2022
1 parent bf97a6d commit 0573cda
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/__init-with-registries.yml

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

6 changes: 4 additions & 2 deletions init/action.yml
Expand Up @@ -15,18 +15,20 @@ inputs:
required: false
registries:
description: |
Use this input only when you need to download CodeQL packages from another instance of GitHub. If you only need to download packages from this GitHub instance, use the token input instead.
A YAML string that defines the list of GitHub container registries to use for downloading packs. The string is in the following form (the | is required on the first line):
registries: |
- url: https://containers.GHEHOSTNAME1/v2/
packages:
- my-company/*
- my-company2/*
token: ${{ secrets.GHEHOSTNAME1_TOKEN }}
token: \$\{{ secrets.GHEHOSTNAME1_TOKEN }}
- url: https://ghcr.io/v2/
packages: */*
token: ${{ secrets.GHCR_TOKEN }}
token: \$\{{ secrets.GHCR_TOKEN }}
The url property contains the URL to the container registry you want to connect to.
Expand Down
2 changes: 1 addition & 1 deletion lib/config-utils.test.js

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

2 changes: 1 addition & 1 deletion lib/config-utils.test.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/config-utils.test.ts
Expand Up @@ -2296,7 +2296,7 @@ test("downloadPacks-with-registries", async (t) => {
t.deepEqual(process.env.GITHUB_TOKEN, sampleApiDetails.auth);
t.deepEqual(
process.env.CODEQL_REGISTRIES_AUTH,
"http://ghcr.io=not-a-token,https://containers.GHEHOSTNAME1/v2/=still-a-token"
"http://ghcr.io=not-a-token,https://containers.GHEHOSTNAME1/v2/=still-not-a-token"
);

// verify the config file contents were set correctly
Expand Down

0 comments on commit 0573cda

Please sign in to comment.