Skip to content

Commit 518c920

Browse files
authored
Merge pull request github#34981 from github/repo-sync
Repo sync
2 parents 776c8a9 + d8a2afc commit 518c920

File tree

10 files changed

+52
-46
lines changed

10 files changed

+52
-46
lines changed

.github/workflows/azure-prod-build-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666
- name: 'Create Azure Container Registry Token'
6767
env:
6868
CONTAINER_REGISTRY_SERVER: ${{ secrets.PROD_REGISTRY_SERVER }}
69+
CONTAINER_REPO: ${{ github.repository }}
6970
run: npm run create-acr-token
7071

7172
- name: 'Docker login'

content/actions/sharing-automations/reusing-workflows.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ You can define inputs and secrets, which can be passed from the caller workflow
136136
required: true
137137
type: string
138138
secrets:
139-
envPAT:
139+
personal_access_token:
140140
required: true
141141
```
142142

@@ -160,22 +160,22 @@ You can define inputs and secrets, which can be passed from the caller workflow
160160
jobs:
161161
reusable_workflow_job:
162162
runs-on: ubuntu-latest
163-
environment: production
164163
steps:
165164
- uses: actions/labeler@v4
166165
with:
167-
repo-token: ${{ secrets.envPAT }}
166+
repo-token: ${{ secrets.personal_access_token }}
168167
configuration-path: ${{ inputs.config-path }}
169168
```
170169

171170
{% endraw %}
172-
In the example above, `envPAT` is an environment secret that's been added to the `production` environment. This environment is therefore referenced within the job.
173171

174-
{% note %}
172+
In the example above, `personal_access_token` is a secret that's defined at the repository or organization level.
175173

176-
**Note**: Environment secrets are {% ifversion fpt or ghec %}encrypted {% endif %}strings that are stored in an environment that you've defined for a repository. Environment secrets are only available to workflow jobs that reference the appropriate environment. For more information, see "[AUTOTITLE](/actions/deployment/targeting-different-environments/managing-environments-for-deployment#environment-secrets)."
174+
{% warning %}
177175

178-
{% endnote %}
176+
**Warning**: Environment secrets cannot be passed from the caller workflow as `on.workflow_call` does not support the `environment` keyword. If you include `environment` in the reusable workflow at the job level, the environment secret will be used, and not the secret passed from the caller workflow. For more information, see "[AUTOTITLE](/actions/deployment/targeting-different-environments/managing-environments-for-deployment#environment-secrets)" and "[AUTOTITLE](/actions/writing-workflows/workflow-syntax-for-github-actions#onworkflow_call)".
177+
178+
{% endwarning %}
179179

180180
1. Pass the input or secret from the caller workflow.
181181

@@ -361,7 +361,7 @@ jobs:
361361
workflowB-calls-workflowC:
362362
uses: different-org/example-repo/.github/workflows/C.yml@main
363363
secrets:
364-
envPAT: ${{ secrets.envPAT }} # pass just this secret
364+
repo-token: ${{ secrets.person_access_token }} # pass just this secret
365365
```
366366

367367
{% endraw %}

content/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/publishing-and-using-codeql-packs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ library: # set to true if the pack is a library. Set to false or omit for a quer
2626
name: <scope>/<pack>
2727
version: <x.x.x>
2828
description: <Description to publish with the package>
29-
default-suite: # optional, one or more queries in the pack to run by default
29+
defaultSuite: # optional, one or more queries in the pack to run by default
3030
- query: <relative-path>/query-file>.ql
31-
default-suite-file: default-queries.qls # optional, a pointer to a query-suite in this pack
31+
defaultSuiteFile: default-queries.qls # optional, a pointer to a query-suite in this pack
3232
license: # optional, the license under which the pack is published
3333
dependencies: # map from CodeQL pack name to version range
3434
```
3535
3636
* `name:` must follow the `<scope>/<pack>` format, where `<scope>` is the {% data variables.product.prodname_dotcom %} organization that you will publish to and `<pack>` is the name for the pack.
3737

38-
* A maximum of one of `default-suite` or `default-suite-file` is allowed. These are two different ways to define a default query suite to be run, the first by specifying queries directly in the qlpack.yml file and the second by specifying a query suite in the pack.
38+
* A maximum of one of `defaultSuite` or `defaultSuiteFile` is allowed. These are two different ways to define a default query suite to be run, the first by specifying queries directly in the qlpack.yml file and the second by specifying a query suite in the pack.
3939

4040
## Running `codeql pack publish`
4141

content/copilot/setting-up-github-copilot/setting-up-github-copilot-for-your-organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Alternatively, you can set up a self-serve workflow using the API. See "[Add tea
4949

5050
Enhance the {% data variables.product.prodname_copilot_short %} experience for your organization by:
5151

52-
* **Indexing repositories** to improve {% data variables.product.prodname_copilot_short %}'s responses relating to {% data variables.product.prodname_dotcom %} repositories _({% data variables.product.prodname_copilot_enterprise_short %} only)_. See "[AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-github-copilot-features-in-your-organization/indexing-repositories-for-copilot-chat)."
52+
* **Indexing repositories** to improve {% data variables.product.prodname_copilot_short %}'s responses relating to {% data variables.product.prodname_dotcom %} repositories. See "[AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-github-copilot-features-in-your-organization/indexing-repositories-for-copilot-chat)."
5353
* **Setting up knowledge bases** for use with {% data variables.product.prodname_copilot_chat_short %} _({% data variables.product.prodname_copilot_enterprise_short %} only)_. See "[AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-github-copilot-features-in-your-organization/managing-copilot-knowledge-bases)."
5454
* **Fine tuning {% data variables.product.prodname_copilot_short %}** by creating a custom large language model. See "[AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/customizing-copilot-for-your-organization/creating-a-custom-model-for-github-copilot)."
5555
* **Installing {% data variables.product.prodname_copilot_extensions_short %}** to integrate other tools with {% data variables.product.prodname_copilot_chat_short %}. See "[AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-github-copilot-features-in-your-organization/installing-github-copilot-extensions-for-your-organization)."

0 commit comments

Comments
 (0)