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

CI: Fix some issues pointed out by zizmor #362

Merged
merged 1 commit into from
Dec 14, 2024

Conversation

felixfontein
Copy link
Collaborator

Fix some issues in GHA workflows pointed out by zizmor (https://github.com/woodruffw/zizmor).

@felixfontein felixfontein added the backport-1 Automatically create backport to stable-1 branch label Dec 14, 2024
@felixfontein felixfontein merged commit 3f8a02e into ansible-community:main Dec 14, 2024
13 checks passed
Copy link

patchback bot commented Dec 14, 2024

Backport to stable-1: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 3f8a02e on top of patchback/backports/stable-1/3f8a02e400cce4007c75e4858a4638e414fe9fcd/pr-362

Backporting merged PR #362 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-community/antsibull-docs.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-1/3f8a02e400cce4007c75e4858a4638e414fe9fcd/pr-362 upstream/stable-1
  4. Now, cherry-pick PR CI: Fix some issues pointed out by zizmor #362 contents into that branch:
    $ git cherry-pick -x 3f8a02e400cce4007c75e4858a4638e414fe9fcd
    If it'll yell at you with something like fatal: Commit 3f8a02e400cce4007c75e4858a4638e414fe9fcd is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 3f8a02e400cce4007c75e4858a4638e414fe9fcd
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR CI: Fix some issues pointed out by zizmor #362 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/3f8a02e400cce4007c75e4858a4638e414fe9fcd/pr-362
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein deleted the ci branch December 14, 2024 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-1 Automatically create backport to stable-1 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant