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 Update base ref property name into release/1.15.x #18928

Merged

Conversation

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

Backport

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

🚨

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:
@NiniOak
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.


Description

PROBLEM
We found a bug where on pull request merge, the following error was returned by the filter_changed_files_go_test.sh

fatal: ambiguous argument 'origin/': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

See example here

SOLUTION
Update the conditional-skip job with a step to conditional check the github event,

  • if event is pull_request merged, set GitHub branch value to github.ref_name
  • for pull_request event, set GitHub branch value to github.head_ref
    Update the filter_changed_files_go_test.sh script to fail on script error and set the default behaviour to trigger CI, the previous behaviour was to skip CI.

Testing & Reproduction steps

CI skipping tests where all changes are from skipped directories
CI running test workflows by default

Links

PR Checklist

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

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Sep 20, 2023

CLA assistant check
All committers have signed the CLA.

Copy link

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

@NiniOak NiniOak marked this pull request as ready for review September 20, 2023 21:41
@vercel vercel bot temporarily deployed to Preview – consul September 20, 2023 21:46 Inactive
@NiniOak NiniOak force-pushed the backport/NET-5611_fix_trigger_ci/seemingly-more-swift branch from 9443b55 to 7bdf915 Compare September 20, 2023 22:13
@NiniOak NiniOak enabled auto-merge (squash) September 20, 2023 22:15
@NiniOak NiniOak force-pushed the backport/NET-5611_fix_trigger_ci/seemingly-more-swift branch from 7bdf915 to a88c768 Compare September 20, 2023 22:34
@NiniOak NiniOak merged commit 9cba9a7 into release/1.15.x Sep 20, 2023
83 checks passed
@NiniOak NiniOak deleted the backport/NET-5611_fix_trigger_ci/seemingly-more-swift branch September 20, 2023 22:48
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.

4 participants