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

custom license #1216

Merged
merged 6 commits into from
May 16, 2024
Merged

custom license #1216

merged 6 commits into from
May 16, 2024

Conversation

xnox
Copy link
Contributor

@xnox xnox commented May 16, 2024

Allow specifying and including custom license texts in the package.

Related: chainguard-dev#1212

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@chainguard.dev>
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@chainguard.dev>
imjasonh
imjasonh previously approved these changes May 16, 2024
@xnox xnox dismissed imjasonh’s stale review May 16, 2024 18:29

The merge-base changed after approval.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@chainguard.dev>
@xnox xnox marked this pull request as ready for review May 16, 2024 18:32
xnox added 2 commits May 16, 2024 19:32
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@chainguard.dev>
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@chainguard.dev>
@xnox xnox requested a review from imjasonh May 16, 2024 19:17
imjasonh
imjasonh previously approved these changes May 16, 2024
@xnox xnox dismissed imjasonh’s stale review May 16, 2024 19:20

The merge-base changed after approval.

imjasonh
imjasonh previously approved these changes May 16, 2024
@xnox xnox dismissed imjasonh’s stale review May 16, 2024 19:25

The merge-base changed after approval.

imjasonh
imjasonh previously approved these changes May 16, 2024
@xnox xnox dismissed imjasonh’s stale review May 16, 2024 19:31

The merge-base changed after approval.

@imjasonh imjasonh enabled auto-merge May 16, 2024 19:31
imjasonh
imjasonh previously approved these changes May 16, 2024
@xnox xnox dismissed imjasonh’s stale review May 16, 2024 19:40

The merge-base changed after approval.

@xnox
Copy link
Contributor Author

xnox commented May 16, 2024

I think github is confused by ort merge strategy

Merge made by the 'ort' strategy.

@imjasonh imjasonh merged commit 436f915 into chainguard-dev:main May 16, 2024
32 checks passed
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.

2 participants