Skip to content

Commit a75a5a2

Browse files
nickvergessennickvergessen
authored
Merge pull request #713 from nextcloud/ci/noid/zizmor-remove-env
ci(zizmor): Remove adjusted secrets-outside-env rule
2 parents 4c836a0 + 1eaf9a6 commit a75a5a2

12 files changed

Lines changed: 26 additions & 26 deletions

‎.github/workflows/dispatch-workflow-org.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Get all repositories
2626
id: get-repos
2727
env:
28-
GH_TOKEN: ${{ secrets.TEMPLATE_WORKFLOW_DISPATCH_PAT }} # zizmor: ignore[secrets-outside-env]
28+
GH_TOKEN: ${{ secrets.TEMPLATE_WORKFLOW_DISPATCH_PAT }}
2929
run: |
3030
repositories=$(gh api \
3131
--paginate \
@@ -45,7 +45,7 @@ jobs:
4545
steps:
4646
- name: Dispatch update workflow
4747
env:
48-
GH_TOKEN: ${{ secrets.TEMPLATE_WORKFLOW_DISPATCH_PAT }} # zizmor: ignore[secrets-outside-env]
48+
GH_TOKEN: ${{ secrets.TEMPLATE_WORKFLOW_DISPATCH_PAT }}
4949
run: |
5050
gh workflow run dispatch-workflow-repo.yml \
5151
--repo ${{ github.repository }} \

‎.github/workflows/dispatch-workflow-repo.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ jobs:
9393
signoff: true
9494
title: '[${{ github.event.inputs.branch }}] ci: update all workflow templates from organization template repository'
9595
labels: dependencies
96-
token: ${{ secrets.TEMPLATE_WORKFLOW_DISPATCH_PAT }} # zizmor: ignore[secrets-outside-env]
96+
token: ${{ secrets.TEMPLATE_WORKFLOW_DISPATCH_PAT }}

‎.github/workflows/dispatch-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ jobs:
109109
signoff: true
110110
title: 'ci: update ${{ github.event.inputs.name }} workflow from template'
111111
labels: dependencies
112-
token: ${{ secrets.TEMPLATE_WORKFLOW_DISPATCH_PAT }} # zizmor: ignore[secrets-outside-env]
112+
token: ${{ secrets.TEMPLATE_WORKFLOW_DISPATCH_PAT }}

‎workflow-templates/appstore-build-publish.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
tar -xvf ${{ env.APP_NAME }}.tar.gz
173173
cd ../../../
174174
# Setting up keys
175-
echo '${{ secrets.APP_PRIVATE_KEY }}' > ${{ env.APP_NAME }}.key # zizmor: ignore[secrets-outside-env]
175+
echo '${{ secrets.APP_PRIVATE_KEY }}' > ${{ env.APP_NAME }}.key
176176
wget --quiet "https://github.com/nextcloud/app-certificate-requests/raw/master/${{ env.APP_NAME }}/${{ env.APP_NAME }}.crt"
177177
# Signing
178178
php nextcloud/occ integrity:sign-app --privateKey=../${{ env.APP_NAME }}.key --certificate=../${{ env.APP_NAME }}.crt --path=../${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}
@@ -194,6 +194,6 @@ jobs:
194194
uses: nextcloud-releases/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1 # v1.0.3
195195
with:
196196
app_name: ${{ env.APP_NAME }}
197-
appstore_token: ${{ secrets.APPSTORE_TOKEN }} # zizmor: ignore[secrets-outside-env]
197+
appstore_token: ${{ secrets.APPSTORE_TOKEN }}
198198
download_url: ${{ steps.attach_to_release.outputs.browser_download_url }}
199-
app_private_key: ${{ secrets.APP_PRIVATE_KEY }} # zizmor: ignore[secrets-outside-env]
199+
app_private_key: ${{ secrets.APP_PRIVATE_KEY }}

‎workflow-templates/command-compile.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Add reaction on start
6060
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
6161
with:
62-
token: ${{ secrets.COMMAND_BOT_PAT }} # zizmor: ignore[secrets-outside-env]
62+
token: ${{ secrets.COMMAND_BOT_PAT }}
6363
repository: ${{ github.event.repository.full_name }}
6464
comment-id: ${{ github.event.comment.id }}
6565
reactions: '+1'
@@ -86,7 +86,7 @@ jobs:
8686
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
8787
if: failure()
8888
with:
89-
token: ${{ secrets.COMMAND_BOT_PAT }} # zizmor: ignore[secrets-outside-env]
89+
token: ${{ secrets.COMMAND_BOT_PAT }}
9090
repository: ${{ github.event.repository.full_name }}
9191
comment-id: ${{ github.event.comment.id }}
9292
reactions: '-1'
@@ -107,7 +107,7 @@ jobs:
107107
with:
108108
# Needed to allow force push later
109109
persist-credentials: true
110-
token: ${{ secrets.COMMAND_BOT_PAT }} # zizmor: ignore[secrets-outside-env]
110+
token: ${{ secrets.COMMAND_BOT_PAT }}
111111
fetch-depth: 0
112112
ref: ${{ needs.init.outputs.head_ref }}
113113

@@ -216,7 +216,7 @@ jobs:
216216
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
217217
if: failure()
218218
with:
219-
token: ${{ secrets.COMMAND_BOT_PAT }} # zizmor: ignore[secrets-outside-env]
219+
token: ${{ secrets.COMMAND_BOT_PAT }}
220220
repository: ${{ github.event.repository.full_name }}
221221
comment-id: ${{ github.event.comment.id }}
222222
reactions: '-1'

‎workflow-templates/command-openapi.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Add reaction on start
6060
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
6161
with:
62-
token: ${{ secrets.COMMAND_BOT_PAT }} # zizmor: ignore[secrets-outside-env]
62+
token: ${{ secrets.COMMAND_BOT_PAT }}
6363
repository: ${{ github.event.repository.full_name }}
6464
comment-id: ${{ github.event.comment.id }}
6565
reactions: '+1'
@@ -86,7 +86,7 @@ jobs:
8686
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
8787
if: failure()
8888
with:
89-
token: ${{ secrets.COMMAND_BOT_PAT }} # zizmor: ignore[secrets-outside-env]
89+
token: ${{ secrets.COMMAND_BOT_PAT }}
9090
repository: ${{ github.event.repository.full_name }}
9191
comment-id: ${{ github.event.comment.id }}
9292
reactions: '-1'
@@ -107,7 +107,7 @@ jobs:
107107
with:
108108
# Needed to allow force push later
109109
persist-credentials: true
110-
token: ${{ secrets.COMMAND_BOT_PAT }} # zizmor: ignore[secrets-outside-env]
110+
token: ${{ secrets.COMMAND_BOT_PAT }}
111111
fetch-depth: 0
112112
ref: ${{ needs.init.outputs.head_ref }}
113113

@@ -193,7 +193,7 @@ jobs:
193193
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
194194
if: failure()
195195
with:
196-
token: ${{ secrets.COMMAND_BOT_PAT }} # zizmor: ignore[secrets-outside-env]
196+
token: ${{ secrets.COMMAND_BOT_PAT }}
197197
repository: ${{ github.event.repository.full_name }}
198198
comment-id: ${{ github.event.comment.id }}
199199
reactions: '-1'

‎workflow-templates/cypress.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ jobs:
118118
- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
119119
uses: cypress-io/github-action@783cb3f07983868532cabaedaa1e6c00ff4786a8 # v7.1.9
120120
with:
121-
record: ${{ secrets.CYPRESS_RECORD_KEY && true }} # zizmor: ignore[secrets-outside-env]
122-
parallel: ${{ secrets.CYPRESS_RECORD_KEY && true }} # zizmor: ignore[secrets-outside-env]
121+
record: ${{ secrets.CYPRESS_RECORD_KEY && true }}
122+
parallel: ${{ secrets.CYPRESS_RECORD_KEY && true }}
123123
# cypress run type
124124
component: ${{ matrix.containers == 'component' }}
125-
group: ${{ secrets.CYPRESS_RECORD_KEY && env.CYPRESS_GROUP }} # zizmor: ignore[secrets-outside-env]
125+
group: ${{ secrets.CYPRESS_RECORD_KEY && env.CYPRESS_GROUP }}
126126
# cypress env
127-
ci-build-id: ${{ secrets.CYPRESS_RECORD_KEY && env.CYPRESS_BUILD_ID }} # zizmor: ignore[secrets-outside-env]
128-
tag: ${{ secrets.CYPRESS_RECORD_KEY && github.event_name }} # zizmor: ignore[secrets-outside-env]
127+
ci-build-id: ${{ secrets.CYPRESS_RECORD_KEY && env.CYPRESS_BUILD_ID }}
128+
tag: ${{ secrets.CYPRESS_RECORD_KEY && github.event_name }}
129129
env:
130130
# Needs to be prefixed with CYPRESS_
131131
CYPRESS_BRANCH: ${{ env.BRANCH }}
@@ -134,7 +134,7 @@ jobs:
134134
# Needed for some specific code workarounds
135135
TESTING: true
136136
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
137-
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} # zizmor: ignore[secrets-outside-env]
137+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
138138
CYPRESS_BUILD_ID: ${{ github.sha }}-${{ github.run_number }}
139139
CYPRESS_GROUP: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }}
140140

‎workflow-templates/npm-audit-fix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
if: steps.checkout.outcome == 'success'
7272
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
7373
with:
74-
token: ${{ secrets.COMMAND_BOT_PAT }} # zizmor: ignore[secrets-outside-env]
74+
token: ${{ secrets.COMMAND_BOT_PAT }}
7575
commit-message: 'fix(deps): Fix npm audit'
7676
committer: GitHub <noreply@github.com>
7777
author: nextcloud-command <nextcloud-command@users.noreply.github.com>

‎workflow-templates/rector-apply.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Create Pull Request
5757
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
5858
with:
59-
token: ${{ secrets.COMMAND_BOT_PAT }} # zizmor: ignore[secrets-outside-env]
59+
token: ${{ secrets.COMMAND_BOT_PAT }}
6060
commit-message: 'refactor: Apply rector changes'
6161
committer: GitHub <noreply@github.com>
6262
author: nextcloud-command <nextcloud-command@users.noreply.github.com>

‎workflow-templates/sync-workflow-templates.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
- name: Create Pull Request
123123
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
124124
with:
125-
token: ${{ secrets.COMMAND_BOT_WORKFLOWS }} # zizmor: ignore[secrets-outside-env]
125+
token: ${{ secrets.COMMAND_BOT_WORKFLOWS }}
126126
commit-message: 'ci(actions): Update workflow templates from organization template repository'
127127
committer: GitHub <noreply@github.com>
128128
author: nextcloud-command <nextcloud-command@users.noreply.github.com>

0 commit comments

Comments
 (0)