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.

Sign up for GitHub

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

Jump to bottom

Fix BUSL license checker to skip >= 1.17.x target branches #19152

Merged
merged 2 commits into from
Oct 11, 2023
Merged

Fix BUSL license checker to skip >= 1.17.x target branches #19152

merged 2 commits into from
Oct 11, 2023

Conversation

analogue
Copy link
Contributor

@analogue analogue commented Oct 11, 2023 •
edited
Loading

Description

Just testing this out on the release branch and then will rubberstamp in all the places.

Testing & Reproduction steps

$ cat crap.sh                                                                                                                                                                                                                                     
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1

if [[ ${GITHUB_BASE_REF} == release/1.14.* ]] || [[ ${GITHUB_BASE_REF} == release/1.15.* ]] || [[ ${GITHUB_BASE_REF} == release/1.16.* ]]; then
    echo "Matched!"
else
    echo "skipped"
fi%                                                                                                                                                                                                                                                                                                                         

$ GITHUB_BASE_REF="release/1.14.x" ./crap.sh
Matched!

$ GITHUB_BASE_REF="release/1.14.2" ./crap.sh
Matched!

$ GITHUB_BASE_REF="release/1.15.x" ./crap.sh
Matched!

$ GITHUB_BASE_REF="release/1.15.4" ./crap.sh
Matched!

$ GITHUB_BASE_REF="release/1.16.x" ./crap.sh
Matched!

$ GITHUB_BASE_REF="release/1.16.4" ./crap.sh
Matched!

$ GITHUB_BASE_REF="release/1.17.x" ./crap.sh
skipped

$ GITHUB_BASE_REF="release/1.17.0" ./crap.sh
skipped

@analogue analogue added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-backport labels Oct 11, 2023
@github-actions github-actions bot added type/ci Relating to continuous integration (CI) tooling for testing or releases theme/contributing Additions and enhancements to community contributing materials labels Oct 11, 2023
@analogue
Copy link
Contributor Author

Results:

https://github.com/hashicorp/consul/actions/runs/6488227092/job/17620216610?pr=19152

Run ./.github/scripts/license_checker.sh
./.github/scripts/license_checker.sh
shell: /usr/bin/bash -e {0}
Skipping BUSL check since release/1.17.x not one of release/1.14.*, release/1.15.*, or release/1.16.*.

nathancoleman
nathancoleman approved these changes Oct 11, 2023
View reviewed changes
.github/scripts/license_checker.sh Outdated Show resolved Hide resolved
@nathancoleman nathancoleman mentioned this pull request Oct 11, 2023
Closed
4 tasks
@analogue @nathancoleman
Update .github/scripts/license_checker.sh
31a8439 
Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
@analogue analogue merged commit 76f5b71 into release/1.17.x Oct 11, 2023
14 checks passed
@analogue analogue deleted the spatel/fix-busl-checker branch October 11, 2023 21:52
analogue added a commit that referenced this pull request Oct 11, 2023
@analogue @nathancoleman
Fix BUSL license checker to skip >= 1.17.x target branches (#19152)
02bfe1d 
* Fix BUSL license checker to skip >= 1.17.x target branches

* Update .github/scripts/license_checker.sh

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>

---------

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
analogue added a commit that referenced this pull request Oct 11, 2023
@analogue @nathancoleman
Fix BUSL license checker to skip >= 1.17.x target branches (#19152) (#…
4996eee 
…19154)

* Fix BUSL license checker to skip >= 1.17.x target branches

* Update .github/scripts/license_checker.sh



---------

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
hc-github-team-consul-core added a commit that referenced this pull request Oct 11, 2023
@hc-github-team-consul-core @analogue
Backport of Fix BUSL license checker to skip >= 1.17.x target branches (
3a9f703 
#19152) into release/1.14.x (#19155)

backport of commit 02bfe1d

Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
hc-github-team-consul-core added a commit that referenced this pull request Oct 11, 2023
@hc-github-team-consul-core @analogue
Backport of Fix BUSL license checker to skip >= 1.17.x target branches (
2f54aff 
#19152) into release/1.15.x (#19156)

backport of commit 02bfe1d

Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
hc-github-team-consul-core added a commit that referenced this pull request Oct 11, 2023
@hc-github-team-consul-core @analogue
Backport of Fix BUSL license checker to skip >= 1.17.x target branches (
41e86bd 
#19152) into release/1.16.x (#19157)

backport of commit 02bfe1d

Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
jmurret pushed a commit that referenced this pull request Oct 12, 2023
@analogue @nathancoleman @jmurret
Fix BUSL license checker to skip >= 1.17.x target branches (#19152) (#…
e6b92b1 
…19154)

* Fix BUSL license checker to skip >= 1.17.x target branches

* Update .github/scripts/license_checker.sh



---------

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
@jira jira bot mentioned this pull request Dec 1, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nathancoleman nathancoleman nathancoleman approved these changes

@rboyer rboyer Awaiting requested review from rboyer

Assignees
No one assigned
Labels
pr/no-backport pr/no-changelog PR does not need a corresponding .changelog entry theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@analogue @nathancoleman