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

Rename project to "bootloose" and update license information #47

Merged
merged 17 commits into from
Oct 2, 2023
Merged

Rename project to "bootloose" and update license information #47

merged 17 commits into from
Oct 2, 2023

Conversation

kke
Copy link
Contributor

@kke kke commented Sep 27, 2023 •
edited
Loading

Renames the project to 'bootloose' to avoid any confusion between this and the old project by replacing all occurences of the old name with the new name.

Things to consider:

  1. The original LICENSE had the year 2019 even though changes have been made until 2023. It was not in the correct place for the copyright line, it was written into the template that you're supposed to copy and modify. I have used the original 2019 claim in the boilerplates and replaced the license file with an unmodified apache 2 license.
  2. There's a bunch of files in pkg/docker that have "kubernetes authors" apache2 boilerplate headers - both parties claims were appended into those.
  3. The boilerplates were added via automation, so there's a chance there are mistakes in selecting if the files are new or pre-existing. Some file formats may not accept such boilerplates. Adding the boilerplates to yamls, .cmds, markdowns and others may be a bit of an overkill, but the apache 2 license clearly states that modified files should be marked as such. I'd say this is "best effort".

@kke kke requested review from ncopa, twz123 and jnummelin September 27, 2023 23:13
kke
kke commented Sep 27, 2023
View reviewed changes
.copyright-boilerplate.new Outdated
@@ -0,0 +1,13 @@
Copyright $year bootloose authors
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The script replaces this with the current year

kke
kke commented Sep 28, 2023
View reviewed changes
LICENSE
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2019 Weaveworks Ltd.
Copyright [yyyy] [name of copyright owner]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The only original claim was here

twz123
twz123 reviewed Sep 28, 2023
View reviewed changes
.github/scripts/check_boilerplate.sh Show resolved Hide resolved
.github/scripts/check_boilerplate.sh Outdated Show resolved Hide resolved
.github/scripts/check_boilerplate.sh Outdated Show resolved Hide resolved
.github/scripts/check_boilerplate.sh Outdated Show resolved Hide resolved
.github/scripts/check_boilerplate.sh Outdated Show resolved Hide resolved
.github/workflows/check-copyright-boilerplate.yaml Outdated Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
tests/.gitignore Outdated Show resolved Hide resolved
NOTICE Outdated Show resolved Hide resolved
@kke kke force-pushed the finish-move branch 2 times, most recently from 05c7f72 to c7e52ed Compare September 28, 2023 12:51
@twz123
Copy link
Member

twz123 commented Sep 28, 2023 •
edited
Loading

Since I've seen it elsewhere, wondering if the headers could be shortened to sth. like the following:

SPDX-License-Identifier: Apache-2.0
SPDX-FileCopyrightText: 2019 Weaveworks Ltd.
SPDX-FileCopyrightText: 2023 bootloose authors

Here's the spec: https://spdx.github.io/spdx-spec/v2.3/file-tags/

kke added 17 commits September 29, 2023 17:38
@kke
Remove unused files
3ed7d0b 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Restore an unmodified apache-2 LICENSE file
f360181 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Add a NOTICE file
f803083 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Add a copyright boilerplate checker and workflow
aeabcd3 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

Hardcode switch_timestamp

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

Match on full filename in check_boilerplate.sh

Co-authored-by: Tom Wieczorek <twz123@users.noreply.github.com>

Send error message to stderr in check_boilerplate.sh

Co-authored-by: Tom Wieczorek <twz123@users.noreply.github.com>

Just call the script directly in copyright workflow

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

Beautify ed-script part, possibly fixing leading empty lines

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

Update shebang in .github/scripts/check_boilerplate.sh

Co-authored-by: Tom Wieczorek <twz123@users.noreply.github.com>

Send error to stderr in .github/scripts/check_boilerplate.sh

Co-authored-by: Tom Wieczorek <twz123@users.noreply.github.com>

Intermediate mergeBase variable in check_boilerplate.sh

Co-authored-by: Tom Wieczorek <twz123@users.noreply.github.com>

shopts in .github/scripts/check_boilerplate.sh

Co-authored-by: Tom Wieczorek <twz123@users.noreply.github.com>

Revert ignore logic in .github/scripts/check_boilerplate.sh

Co-authored-by: Tom Wieczorek <twz123@users.noreply.github.com>

Revert skip logic in .github/scripts/check_boilerplate.sh

Co-authored-by: Tom Wieczorek <twz123@users.noreply.github.com>

Error message to stderr in github/scripts/check_boilerplate.sh

Co-authored-by: Tom Wieczorek <twz123@users.noreply.github.com>

Fix gh pr file list in check_boilerplate.sh

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Rename project to bootloose
f8cbf65 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Update .gitignore
7cfaf3f 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Use bootloose-ubuntu20.04 as image
2dedf13 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Fix double build in Makefile
700ac65 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Add README attribution
fb7808b 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Replace README asciinema with a snippet from console
0f94fd5 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Update the image in the fedora example
49c3e0a 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Update contact info in README.md
16939e8 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Always use a lower case app name
e6a41fb 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Mention .github in NOTICE
6e0db58 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Copyright boilerplate script SPDX version
9036b03 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Apply boilerplate autofixes
74f4596 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke
Manual boilerplate fixes
b4ceb26 
Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
@kke kke changed the title Rename project to "bootloose" and update licenses Rename project to "bootloose" and update license information Oct 2, 2023
@kke kke merged commit f58b065 into main Oct 2, 2023
@kke kke deleted the finish-move branch October 2, 2023 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@twz123 twz123 twz123 approved these changes

@ncopa ncopa Awaiting requested review from ncopa

@jnummelin jnummelin Awaiting requested review from jnummelin

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kke @twz123