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

Backport of [NET-11150] ci: fix conditional skip and add safeguard into release/1.20.x #21783

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #21781 to be assessed for backporting due to the inclusion of the label backport/1.20.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Adopt a third-party action to avoid script bugs, and to fix a current issue where the script fails to detect all changes when processing push events on PR branches.

Adapted from hashicorp/consul-dataplane#637. See that PR for testing details and background context.

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

Copy link

hashicorp-cla-app bot commented Sep 25, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@zalimeni zalimeni force-pushed the backport/zalimeni/fix-ci-skip-action/arguably-on-gibbon branch from 1b4fd4b to 7df77ca Compare September 25, 2024 17:21
@zalimeni zalimeni marked this pull request as ready for review September 25, 2024 17:22
@zalimeni zalimeni enabled auto-merge (squash) September 25, 2024 17:22
@zalimeni zalimeni merged commit 026bcce into release/1.20.x Sep 25, 2024
93 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/fix-ci-skip-action/arguably-on-gibbon branch September 25, 2024 17:34
boruszak added a commit that referenced this pull request Oct 14, 2024
* Backport of ci: update the security-scanner gha token into release/1.20.x (#21754)

backport of commit eb9dbc9

Co-authored-by: dduzgun-security <[email protected]>

* Backport of Initialize 1.20 Release into release/1.20.x (#21753)

* backport of commit a33e903

* backport of commit 37163dc

* backport of commit 38f0907

* backport of commit 6ab7ec2

* backport of commit 7ac4178

* backport of commit 5dfebb2

* backport of commit 316d68c

---------

Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* Backport of Stage rc release into release/1.20.x (#21772)

backport of commit d311f2b

Co-authored-by: Sarah Alsmiller <[email protected]>

* Backport of Upgrade ubi image to 9.4 into release/1.20.x (#21773)

* backport of commit 888e302

* backport of commit 17499dc

* backport of commit d933d37

---------

Co-authored-by: Dhia Ayachi <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* Backport of security: update alpine base image to 3.20 into release/1.20.x (#21774)

* backport of commit 4421ce1

* Upgrade ubi image to 9.4 (#21750)

---------

Co-authored-by: Michael Zalimeni <[email protected]>
Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* Backport of fix spacing of bash scripts into release/1.20.x (#21769)

* backport of commit 1e97297

* backport of commit b7053f5

* backport of commit a391f2f

---------

Co-authored-by: jm96441n <[email protected]>

* Backport of [NET-11150] ci: fix conditional skip and add safeguard into release/1.20.x (#21783)

backport of commit c3db6c9

Co-authored-by: Michael Zalimeni <[email protected]>

* initial commit

* Initial pages

* Edits to other pages + nav & redirects

* minor fixes

* Backport of security: update alpine base image to 3.20 into release/1.20.x (#21774)

* backport of commit 4421ce1

* Upgrade ubi image to 9.4 (#21750)

---------

Co-authored-by: Michael Zalimeni <[email protected]>
Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* CE-679

* align with main

* Content updates

* minor edit

* Apply suggestions from code review

Co-authored-by: Aimee Ukasick <[email protected]>
Co-authored-by: Blake Covarrubias <[email protected]>

* CoreDNS config update

* small edits

* typo fix

---------

Co-authored-by: hc-github-team-consul-core <[email protected]>
Co-authored-by: dduzgun-security <[email protected]>
Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>
Co-authored-by: Dhia Ayachi <[email protected]>
Co-authored-by: Michael Zalimeni <[email protected]>
Co-authored-by: jm96441n <[email protected]>
Co-authored-by: Aimee Ukasick <[email protected]>
Co-authored-by: Blake Covarrubias <[email protected]>
missylbytes pushed a commit that referenced this pull request Oct 29, 2024
* Backport of ci: update the security-scanner gha token into release/1.20.x (#21754)

backport of commit eb9dbc9

Co-authored-by: dduzgun-security <[email protected]>

* Backport of Initialize 1.20 Release into release/1.20.x (#21753)

* backport of commit a33e903

* backport of commit 37163dc

* backport of commit 38f0907

* backport of commit 6ab7ec2

* backport of commit 7ac4178

* backport of commit 5dfebb2

* backport of commit 316d68c

---------

Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* Backport of Stage rc release into release/1.20.x (#21772)

backport of commit d311f2b

Co-authored-by: Sarah Alsmiller <[email protected]>

* Backport of Upgrade ubi image to 9.4 into release/1.20.x (#21773)

* backport of commit 888e302

* backport of commit 17499dc

* backport of commit d933d37

---------

Co-authored-by: Dhia Ayachi <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* Backport of security: update alpine base image to 3.20 into release/1.20.x (#21774)

* backport of commit 4421ce1

* Upgrade ubi image to 9.4 (#21750)

---------

Co-authored-by: Michael Zalimeni <[email protected]>
Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* Backport of fix spacing of bash scripts into release/1.20.x (#21769)

* backport of commit 1e97297

* backport of commit b7053f5

* backport of commit a391f2f

---------

Co-authored-by: jm96441n <[email protected]>

* Backport of [NET-11150] ci: fix conditional skip and add safeguard into release/1.20.x (#21783)

backport of commit c3db6c9

Co-authored-by: Michael Zalimeni <[email protected]>

* initial commit

* Initial pages

* Edits to other pages + nav & redirects

* minor fixes

* Backport of security: update alpine base image to 3.20 into release/1.20.x (#21774)

* backport of commit 4421ce1

* Upgrade ubi image to 9.4 (#21750)

---------

Co-authored-by: Michael Zalimeni <[email protected]>
Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* CE-679

* align with main

* Content updates

* minor edit

* Apply suggestions from code review

Co-authored-by: Aimee Ukasick <[email protected]>
Co-authored-by: Blake Covarrubias <[email protected]>

* CoreDNS config update

* small edits

* typo fix

---------

Co-authored-by: hc-github-team-consul-core <[email protected]>
Co-authored-by: dduzgun-security <[email protected]>
Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>
Co-authored-by: Dhia Ayachi <[email protected]>
Co-authored-by: Michael Zalimeni <[email protected]>
Co-authored-by: jm96441n <[email protected]>
Co-authored-by: Aimee Ukasick <[email protected]>
Co-authored-by: Blake Covarrubias <[email protected]>
missylbytes pushed a commit that referenced this pull request Oct 30, 2024
* Backport of ci: update the security-scanner gha token into release/1.20.x (#21754)

backport of commit eb9dbc9

Co-authored-by: dduzgun-security <[email protected]>

* Backport of Initialize 1.20 Release into release/1.20.x (#21753)

* backport of commit a33e903

* backport of commit 37163dc

* backport of commit 38f0907

* backport of commit 6ab7ec2

* backport of commit 7ac4178

* backport of commit 5dfebb2

* backport of commit 316d68c

---------

Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* Backport of Stage rc release into release/1.20.x (#21772)

backport of commit d311f2b

Co-authored-by: Sarah Alsmiller <[email protected]>

* Backport of Upgrade ubi image to 9.4 into release/1.20.x (#21773)

* backport of commit 888e302

* backport of commit 17499dc

* backport of commit d933d37

---------

Co-authored-by: Dhia Ayachi <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* Backport of security: update alpine base image to 3.20 into release/1.20.x (#21774)

* backport of commit 4421ce1

* Upgrade ubi image to 9.4 (#21750)

---------

Co-authored-by: Michael Zalimeni <[email protected]>
Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* Backport of fix spacing of bash scripts into release/1.20.x (#21769)

* backport of commit 1e97297

* backport of commit b7053f5

* backport of commit a391f2f

---------

Co-authored-by: jm96441n <[email protected]>

* Backport of [NET-11150] ci: fix conditional skip and add safeguard into release/1.20.x (#21783)

backport of commit c3db6c9

Co-authored-by: Michael Zalimeni <[email protected]>

* initial commit

* Initial pages

* Edits to other pages + nav & redirects

* minor fixes

* Backport of security: update alpine base image to 3.20 into release/1.20.x (#21774)

* backport of commit 4421ce1

* Upgrade ubi image to 9.4 (#21750)

---------

Co-authored-by: Michael Zalimeni <[email protected]>
Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>

* CE-679

* align with main

* Content updates

* minor edit

* Apply suggestions from code review

Co-authored-by: Aimee Ukasick <[email protected]>
Co-authored-by: Blake Covarrubias <[email protected]>

* CoreDNS config update

* small edits

* typo fix

---------

Co-authored-by: hc-github-team-consul-core <[email protected]>
Co-authored-by: dduzgun-security <[email protected]>
Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>
Co-authored-by: Dhia Ayachi <[email protected]>
Co-authored-by: Michael Zalimeni <[email protected]>
Co-authored-by: jm96441n <[email protected]>
Co-authored-by: Aimee Ukasick <[email protected]>
Co-authored-by: Blake Covarrubias <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants