Add go licenses to licenses.txt #21034

silverwind · 2022-09-02T23:03:16Z

make go-licenses will generate assets/go-licenses.json which is then included in the webpack build.

This step depends on both go and node being present, so unfortunately, I could not automate the generation by hooking it up to tidy as that target is triggered on CI where we do not have a docker image with both go an node.

It should be ran from time to time, ideally after each go mod update.

6543 · 2022-09-02T23:08:47Z

coverage-bodged.out should not be within this pull

silverwind · 2022-09-02T23:09:41Z

Should be fixed, branch got messed up through rebases.

build/generate-go-licenses.js

`make go-licenses` will generate `assets/go-licenses.txt` which is then included in the webpack build. This step depends on both go and node being present, so unfortunately, I could not automate the generation by hooking it up to `tidy` as that target is triggered on CI. It should be ran from time to time, ideally after each go mod update.

silverwind · 2022-09-03T09:34:13Z

Small rewrite incoming, which will sort all modules at once.

silverwind · 2022-09-03T09:44:24Z

Data is now passed through a JSON file to webpack, which enabled me to sort all modules at once, e.g. showing now preference for js vs. go modules like earlier.

silverwind · 2022-09-03T11:57:50Z

One future addition might be to parse the go module version from go.sum, but I'm not feeling like that right now 😉.

6543 · 2022-09-03T18:04:06Z

@silverwind add go-licenses target to make tidy and make vendor ?

not as precond. but as command afterwards

silverwind · 2022-09-03T18:05:35Z

Possible, but it would require node to be installed for checks-backend ci target because of the dependency chain:

checks-backend > tidy-check > tidy > go-licenses

silverwind · 2022-09-03T18:17:35Z

Did that now, so make tidy now triggers the target if necessary. I didn't feel like adding it to make vendor because that is invoked in release pipelines and it seems just unnecessary there.

zeripath · 2022-09-04T16:25:02Z

This is still running on make vendor and it's running somewhat intermittently occasionally resulting in an empty file.

I would say that this should really be in make generate as it is a generation step not tidy.

The go-licenses check introduced in go-gitea#21034 is being run on make vendor and occassionally causes an empty go-licenses file if the vendors need to change. This should be moved to the generate task as it is a generated file. Ref go-gitea#21034 Signed-off-by: Andrew Thornton <art27@cantab.net>

* upstream/main: (22 commits) [skip ci] Updated translations via Crowdin Webhook for Wiki changes (go-gitea#20219) test: use `T.TempDir` to create temporary test directory (go-gitea#21043) Set uploadpack.allowFilter etc on gitea serv to enable partial clones with ssh (go-gitea#20902) Fix 500 on time tracking in timeline API (go-gitea#21052) Add more checks in migration code (go-gitea#21011) Fill the specified ref in webhook test payload (go-gitea#20961) [skip ci] Updated licenses and gitignores Add go licenses to licenses.txt (go-gitea#21034) Added docs for agit-setup (go-gitea#21027) Add another index for Action table on postgres (go-gitea#21033) Delete unreferenced packages when deleting a package version (go-gitea#20977) Improve arc-green code theme (go-gitea#21039) Add down key check has tribute container (go-gitea#21016) Do not add links to Posters or Assignees with ID < 0 (go-gitea#20577) [skip ci] Updated translations via Crowdin Show language name on hover (go-gitea#20923) fix: PackageMetadataVersion deps (go-gitea#21017) Fix the quick-submit for pending review comment (go-gitea#20992) Kd/ci playwright go test (go-gitea#20123) ...

…d backend component (#21061) The `go-licenses` make task introduced in #21034 is being run on make vendor and occasionally causes an empty go-licenses file if the vendors need to change. This should be moved to the generate task as it is a generated file. Now because of this change we also need to split generation into two separate steps: 1. `generate-backend` 2. `generate-frontend` In the future it would probably be useful to make `generate-swagger` part of `generate-frontend` but it's not tolerated with our .drone.yml Ref #21034 Signed-off-by: Andrew Thornton <art27@cantab.net> Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: delvh <dev.lh@web.de>

silverwind · 2022-09-05T09:06:49Z

This is still running on make vendor and it's running somewhat intermittently occasionally resulting in an empty file.

I would say that this should really be in make generate as it is a generation step not tidy.

It has to run after tidy thought, otherwise it may produce outdated results. Thought if it runs after tidy-check, that will also work because that target ensure tidy is consistent.

zeripath · 2022-09-05T11:17:28Z

It has to run after tidy thought, otherwise it may produce outdated results. Thought if it runs after tidy-check, that will also work because that target ensure tidy is consistent.

You can't really build without make vendor being up-to-date so that's probably not the issue.

In fact we should be able to make make make vendor when make backend if go.mod is newer than go.sum, and then if we make make go-licenses dependent on vendor and go.mod we should be able to make make make go-licenses when we make frontend

The only issue is how drone will behave.

silverwind · 2022-09-05T17:20:19Z

As I see it make vendor should be a complete standalone task. It just downloads what is in go.sum to the vendordirectory, used for release source tarballs. Build will work with or without this directory as it sources dependencies from GOPATH.

In any case, I think I will at least rewrite generate-go-licenses.js to go, to eliminate the node dependency of the step.

silverwind · 2022-09-05T18:30:33Z

Go rewrite of script in #21078.

silverwind added the dependencies label Sep 2, 2022

silverwind force-pushed the go-licenses branch from b1555a8 to 443aac9 Compare September 2, 2022 23:06

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 2, 2022

silverwind force-pushed the go-licenses branch from 443aac9 to 8571b37 Compare September 2, 2022 23:09

silverwind commented Sep 2, 2022

View reviewed changes

build/generate-go-licenses.js Outdated Show resolved Hide resolved

silverwind added 6 commits September 3, 2022 01:56

remove coverage-bodged.out

4ea9fc5

use same regex as google/go-licenses

98930e0

fix sorts

6cb3a72

misc tweaks

e86480e

Update build/generate-go-licenses.js

dd6c035

silverwind force-pushed the go-licenses branch from 1d8d41c to dd6c035 Compare September 2, 2022 23:57

silverwind added this to the 1.18.0 milestone Sep 3, 2022

lunny approved these changes Sep 3, 2022

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Sep 3, 2022

delvh approved these changes Sep 3, 2022

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Sep 3, 2022

make target fully phony

dddd265

change to json asset, sort all dependencies at once

a5c5073

Merge branch 'main' into go-licenses

6efe1cb

delvh approved these changes Sep 3, 2022

View reviewed changes

add make dependencies on tidy

0bd2a00

silverwind and others added 5 commits September 3, 2022 20:21

add go-licenses to deps-backend

b346392

add DEBIAN_FRONTEND to all apt calls

4a791ce

swap flag order

eadda1b

Merge branch 'main' into go-licenses

f3a7d80

update make help

4c5edca

6543 approved these changes Sep 3, 2022

View reviewed changes

6543 merged commit 49efd1f into go-gitea:main Sep 3, 2022

silverwind deleted the go-licenses branch September 4, 2022 10:47

zeripath mentioned this pull request Sep 4, 2022

Move go-licenses to generate and separate generate into a frontend and backend component #21061

Merged

go-gitea locked and limited conversation to collaborators May 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add go licenses to licenses.txt #21034

Add go licenses to licenses.txt #21034

silverwind commented Sep 2, 2022 •

edited

Loading

6543 commented Sep 2, 2022

silverwind commented Sep 2, 2022

silverwind commented Sep 3, 2022

silverwind commented Sep 3, 2022

silverwind commented Sep 3, 2022

6543 commented Sep 3, 2022 •

edited

Loading

silverwind commented Sep 3, 2022 •

edited

Loading

silverwind commented Sep 3, 2022 •

edited

Loading

zeripath commented Sep 4, 2022

silverwind commented Sep 5, 2022 •

edited

Loading

zeripath commented Sep 5, 2022

silverwind commented Sep 5, 2022 •

edited

Loading

silverwind commented Sep 5, 2022

Add go licenses to licenses.txt #21034

Add go licenses to licenses.txt #21034

Conversation

silverwind commented Sep 2, 2022 • edited Loading

6543 commented Sep 2, 2022

silverwind commented Sep 2, 2022

silverwind commented Sep 3, 2022

silverwind commented Sep 3, 2022

silverwind commented Sep 3, 2022

6543 commented Sep 3, 2022 • edited Loading

silverwind commented Sep 3, 2022 • edited Loading

silverwind commented Sep 3, 2022 • edited Loading

zeripath commented Sep 4, 2022

silverwind commented Sep 5, 2022 • edited Loading

zeripath commented Sep 5, 2022

silverwind commented Sep 5, 2022 • edited Loading

silverwind commented Sep 5, 2022

silverwind commented Sep 2, 2022 •

edited

Loading

6543 commented Sep 3, 2022 •

edited

Loading

silverwind commented Sep 3, 2022 •

edited

Loading

silverwind commented Sep 3, 2022 •

edited

Loading

silverwind commented Sep 5, 2022 •

edited

Loading

silverwind commented Sep 5, 2022 •

edited

Loading