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.

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

workflows: fix most template-injection warnings #196045

Merged
merged 1 commit into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ jobs:
- name: Get cache key
id: cache-key
run: |
cache_key_prefix="${{ runner.os }}"
if [ "${{ runner.os }}" = macOS ]
cache_key_prefix="${RUNNER_OS}"
if [ "${RUNNER_OS}" = macOS ]
then
macos_version="$(sw_vers -productVersion)"
cache_key_prefix="${macos_version%%.*}-$(uname -m)"
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/create-replacement-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ jobs:
HOMEBREW_GPG_PASSPHRASE: ${{ inputs.autosquash && secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_CORE_PUBLIC_REPO_EMAIL_TOKEN }}
MESSAGE: ${{ inputs.message }}
AUTOSQUASH_FLAG: ${{ inputs.autosquash && '--autosquash' || '' }}
CLEAN_FLAG: ${{ inputs.autosquash && '' || '--clean' }}
NO_CHERRY_PICK_FLAG: ${{ inputs.autosquash && '' || '--no-cherry-pick' }}
run: |
# Don't quote arguments that might be empty; this causes errors.
brew pr-pull \
Expand All @@ -172,8 +175,10 @@ jobs:
--committer="$BREWTESTBOT_NAME_EMAIL" \
--root-url="https://ghcr.io/v2/homebrew/core" \
--retain-bottle-dir \
${{ inputs.autosquash && '--autosquash' || '--clean --no-cherry-pick' }} \
${{ inputs.message && '--message="$MESSAGE"' || '' }} \
${AUTOSQUASH_FLAG:+"${AUTOSQUASH_FLAG}"} \
${CLEAN_FLAG:+"--clean"} \
${NO_CHERRY_PICK_FLAG:+"--no-cherry-pick"} \
${MESSAGE:+"--message=${MESSAGE}"} \
"$PR"

- name: Generate build provenance
Expand All @@ -191,14 +196,16 @@ jobs:
HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
HOMEBREW_GITHUB_PACKAGES_USER: brewtestbot
HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{secrets.HOMEBREW_CORE_GITHUB_PACKAGES_TOKEN}}
WARN_ON_UPLOAD_FAILURE_FLAG: ${{inputs.warn_on_upload_failure && '--warn-on-upload-failure' || ''}}
run: |
# Don't quote arguments that might be empty; this causes errors when `brew`
# interprets them as empty arguments when we want `brew` to ignore them instead.
brew pr-upload \
--debug \
--committer="$BREWTESTBOT_NAME_EMAIL" \
--root-url="https://ghcr.io/v2/homebrew/core" \
${{inputs.warn_on_upload_failure && '--warn-on-upload-failure' || ''}}
${WARN_ON_UPLOAD_FAILURE_FLAG:+"${WARN_ON_UPLOAD_FAILURE_FLAG}"}


- name: Push commits
uses: Homebrew/actions/git-try-push@master
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/publish-commit-bottles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ jobs:
id: pr-branch-check
env:
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
AUTOSQUASH: ${{inputs.autosquash}}
run: |
pr_data="$(
gh api \
Expand Down Expand Up @@ -169,7 +170,7 @@ jobs:
echo "remote=$remote"
echo "node_id=$node_id"
echo "requires_merge=$requires_merge"
echo "replace=${{ inputs.autosquash }}"
echo "replace=${AUTOSQUASH}"
} >> "$GITHUB_OUTPUT"

if "$pushable" && [[ "$fork_type" != "Organization" ]] ||
Expand All @@ -195,12 +196,14 @@ jobs:
fromJson(steps.pr-branch-check.outputs.requires_merge)
env:
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
AUTOSQUASH: ${{inputs.autosquash}}
UPLOAD: ${{!inputs.autosquash}}
run: |
gh workflow run create-replacement-pr.yml \
--ref "$GITHUB_REF_NAME" \
--field pull_request="$PR" \
--field autosquash=${{ inputs.autosquash }} \
--field upload=${{ !inputs.autosquash }} \
--field autosquash="${AUTOSQUASH}" \
--field upload="${UPLOAD}" \
--field warn_on_upload_failure=false \
--field message="$INPUT_MESSAGE" \
--repo "$GITHUB_REPOSITORY"
Expand Down Expand Up @@ -299,6 +302,8 @@ jobs:
HOMEBREW_GITHUB_API_TOKEN: ${{secrets.HOMEBREW_CORE_PUBLIC_REPO_EMAIL_TOKEN}}
EXPECTED_SHA: ${{needs.check.outputs.head_sha}}
LARGE_RUNNER: ${{inputs.large_runner}}
WARN_ON_UPLOAD_FAILURE_FLAG: ${{inputs.warn_on_upload_failure && '--warn-on-upload-failure' || ''}}
MESSAGE: ${{inputs.message}}
run: |
local_git_head="$(git rev-parse HEAD)"
remote_git_head="$(git ls-remote origin "pull/$PR/head" | cut -f1)"
Expand Down Expand Up @@ -330,8 +335,8 @@ jobs:
--committer="$BREWTESTBOT_NAME_EMAIL" \
--root-url="https://ghcr.io/v2/homebrew/core" \
--retain-bottle-dir \
${{inputs.warn_on_upload_failure && '--warn-on-upload-failure' || ''}} \
${{inputs.message && '--message="$INPUT_MESSAGE"' || ''}} \
${WARN_ON_UPLOAD_FAILURE_FLAG:+"${WARN_ON_UPLOAD_FAILURE_FLAG}"} \
${MESSAGE:+"--message=${MESSAGE}"} \
"$PR"

- name: Generate build provenance
Expand All @@ -348,14 +353,16 @@ jobs:
HOMEBREW_GITHUB_PACKAGES_USER: brewtestbot
HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{secrets.HOMEBREW_CORE_GITHUB_PACKAGES_TOKEN}}
REPO_PATH: ${{steps.set-up-homebrew.outputs.repository-path}}
WARN_ON_UPLOAD_FAILURE_FLAG: ${{inputs.warn_on_upload_failure && '--warn-on-upload-failure' || ''}}
run: |
# Don't quote arguments that might be empty; this causes errors when `brew`
# interprets them as empty arguments when we want `brew` to ignore them instead.
brew pr-upload \
--debug \
--committer="$BREWTESTBOT_NAME_EMAIL" \
--root-url="https://ghcr.io/v2/homebrew/core" \
${{inputs.warn_on_upload_failure && '--warn-on-upload-failure' || ''}}
${WARN_ON_UPLOAD_FAILURE_FLAG:+"${WARN_ON_UPLOAD_FAILURE_FLAG}"}


echo "head_sha=$(git -C "$REPO_PATH" rev-parse HEAD)" >> "$GITHUB_OUTPUT"

Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check `tests` result
env:
TESTS_RESULT: ${{ needs.tests.result }}
DEPS_TESTS_RESULT: ${{ needs.test_deps.result }}
RUNNERS_PRESENT: ${{ needs.setup_runners.outputs.runners_present }}
SYNTAX_ONLY: ${{ needs.setup_tests.outputs.syntax-only }}
run: |
result='${{ needs.tests.result }}'
result="${TESTS_RESULT}"
# Silence lint error about backtick usage inside single quotes.
# shellcheck disable=SC2016
printf '::notice ::`tests` job status: %s\n' "$result"
Expand All @@ -388,7 +393,7 @@ jobs:
# shellcheck disable=SC2016
printf '::error ::`tests` job %s.\n' "$result"

deps_result='${{ needs.test_deps.result }}'
deps_result="${DEPS_TESTS_RESULT}"
if [[ "$deps_result" = "skipped" ]]
then
# Silence lint error about backtick usage inside single quotes.
Expand All @@ -399,8 +404,8 @@ jobs:
exit 1
fi

runners_present='${{ needs.setup_runners.outputs.runners_present }}'
syntax_only='${{ needs.setup_tests.outputs.syntax-only }}'
runners_present="${RUNNERS_PRESENT-}"
syntax_only="${SYNTAX_ONLY-}"

# The tests job can be skipped only if the PR is syntax-only
# or no runners were assigned.
Expand Down
Loading