Skip to content

Backport of NET-5371 License checker pt2 into release/1.15.x#18494

Merged
hc-github-team-consul-core merged 1 commit intorelease/1.15.xfrom
backport/license-checker-pt2/subtly-secure-raccoon
Aug 16, 2023
Merged

Backport of NET-5371 License checker pt2 into release/1.15.x#18494
hc-github-team-consul-core merged 1 commit intorelease/1.15.xfrom
backport/license-checker-pt2/subtly-secure-raccoon

Conversation

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

Backport

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

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


Description

I created a test PR (#18486) after merging this action originally in #18485 and realized that grep behaves differently in ubuntu:latest than it does in MacOS.

This updates to use a format that works in Ubuntu and runs the action whenever new commits are pushed to a backport PR instead of just when it's initially opened.

Testing & Reproduction steps

Ran script in an Ubuntu docker container

$ docker run -it ubuntu:latest /bin/sh
$ apt update && apt install git
$ git clone https://github.com/hashicorp/consul
$ cd consul
$ ./.github/scripts/license_checker.sh
# Observe failure because many files have the BUSL header
$ git checkout release/1.15.x
$ git checkout license-checker-pt2 -- .github/scripts/license_checker.sh
$ ./.github/scripts/license_checker.sh
# Observe success because no files have the BUSL header

Links

PR Checklist

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

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core requested a review from a team as a code owner August 16, 2023 20:48
@hc-github-team-consul-core hc-github-team-consul-core requested a review from a team August 16, 2023 20:48
@hc-github-team-consul-core hc-github-team-consul-core requested review from claire-labry and dekimsey and removed request for a team August 16, 2023 20:48
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/license-checker-pt2/subtly-secure-raccoon branch from fbee7f8 to 24a2fd1 Compare August 16, 2023 20:48
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/license-checker-pt2/subtly-secure-raccoon branch from 656090c to 2eb6118 Compare August 16, 2023 20:48
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging August 16, 2023 20:49 Inactive
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

@github-actions github-actions bot added type/docs Documentation needs to be created/updated/clarified theme/api Relating to the HTTP API interface theme/acls ACL and token generation theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/ui Anything related to the UI theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies theme/tls Using TLS (Transport Layer Security) or mTLS (mutual TLS) to secure communication type/ci Relating to continuous integration (CI) tooling for testing or releases pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support theme/contributing Additions and enhancements to community contributing materials theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/certificates Related to creating, distributing, and rotating certificates in Consul theme/agent-cache Agent Cache theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation labels Aug 16, 2023
@hc-github-team-consul-core

This comment was marked as outdated.

* Update grep command to work on ubuntu

* Run license checker when new commits are pushed to PR
@nathancoleman nathancoleman force-pushed the backport/license-checker-pt2/subtly-secure-raccoon branch from 2eb6118 to 4e629b1 Compare August 16, 2023 20:53
@nathancoleman nathancoleman removed request for a team, claire-labry and dekimsey August 16, 2023 20:53
@nathancoleman nathancoleman removed type/docs Documentation needs to be created/updated/clarified theme/api Relating to the HTTP API interface theme/acls ACL and token generation theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/ui Anything related to the UI theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies theme/tls Using TLS (Transport Layer Security) or mTLS (mutual TLS) to secure communication theme/envoy/xds Related to Envoy support theme/contributing Additions and enhancements to community contributing materials theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/certificates Related to creating, distributing, and rotating certificates in Consul theme/agent-cache Agent Cache theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation labels Aug 16, 2023
Copy link
Member

@nathancoleman nathancoleman left a comment

Choose a reason for hiding this comment

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

Matches source PR

@hc-github-team-consul-core hc-github-team-consul-core merged commit 8b5e103 into release/1.15.x Aug 16, 2023
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/license-checker-pt2/subtly-secure-raccoon branch August 16, 2023 21:33
@atlassian atlassian bot mentioned this pull request Aug 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/dependencies PR specifically updates dependencies of project type/ci Relating to continuous integration (CI) tooling for testing or releases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants