Skip to content

Commit 71f3b58

Browse files
committed
git merge branch 'main' of https://github.com/Ruh-Al-Tarikh/Cli into dependabot/github_actions/actions/attest-build-provenance-3.1.0
2 parents 51484d2 + 9148feb commit 71f3b58

File tree

3 files changed

+474
-2
lines changed

3 files changed

+474
-2
lines changed
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Third Party Licenses
2+
on:
3+
push:
4+
branches:
5+
- trunk
6+
paths:
7+
- .github/licenses.tmpl
8+
- .github/workflows/third-party-licenses.yml
9+
- go.mod
10+
- go.sum
11+
- script/licenses*
12+
jobs:
13+
# This job is responsible for updating the third-party license reports and source code.
14+
# It should be safe to cancel as the latest version of `go.mod` should be checked in.
15+
regenerate-licenses:
16+
runs-on: ubuntu-latest
17+
concurrency:
18+
group: ${{ github.workflow }}
19+
cancel-in-progress: true
20+
permissions:
21+
contents: write
22+
steps:
23+
- name: Check out code
24+
uses: actions/checkout@v6
25+
with:
26+
ref: trunk
27+
28+
- name: Set up Go
29+
uses: actions/setup-go@v6
30+
with:
31+
go-version-file: 'go.mod'
32+
33+
- name: Regenerate licenses
34+
run: |
35+
export GOROOT=$(go env GOROOT)
36+
export PATH=${GOROOT}/bin:$PATH
37+
go install github.com/google/go-licenses@5348b744d0983d85713295ea08a20cca1654a45e
38+
make licenses
39+
git diff
40+
41+
- name: Commit and push changes
42+
run: |
43+
if git diff --exit-code; then
44+
echo "No third-party license changes to commit"
45+
else
46+
git config --local user.name "github-actions[bot]"
47+
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
48+
git add third-party third-party-licenses.*.md
49+
git commit -m "Generate licenses - $GITHUB_SHA"
50+
git pull
51+
git push origin
52+
fi

go.mod

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,40 @@ require (
5050
github.com/vmihailenco/msgpack/v5 v5.4.1
5151
github.com/yuin/goldmark v1.7.16
5252
github.com/zalando/go-keyring v0.2.6
53+
<<<<<<< HEAD
54+
golang.org/x/crypto v0.45.0
55+
golang.org/x/sync v0.18.0
56+
golang.org/x/term v0.37.0
57+
golang.org/x/text v0.31.0
58+
=======
5359
<<<<<<< HEAD
5460
golang.org/x/crypto v0.43.0
5561
golang.org/x/sync v0.17.0
62+
<<<<<<< HEAD
63+
golang.org/x/term v0.35.0
64+
golang.org/x/text v0.29.0
65+
google.golang.org/grpc v1.76.0
66+
=======
5667
golang.org/x/term v0.36.0
5768
golang.org/x/text v0.30.0
69+
>>>>>>> main
5870
google.golang.org/grpc v1.75.0
71+
<<<<<<< HEAD
72+
<<<<<<< HEAD
73+
google.golang.org/protobuf v1.36.10
74+
=======
75+
=======
76+
>>>>>>> main
77+
>>>>>>> 129f8b6e3123e3a8e5263cf7ccf067a6dbb2e4a9
5978
google.golang.org/protobuf v1.36.9
6079
=======
6180
golang.org/x/crypto v0.46.0
6281
golang.org/x/sync v0.19.0
63-
golang.org/x/term v0.38.0
82+
golang.org/x/term v0.39.0
6483
golang.org/x/text v0.32.0
6584
google.golang.org/grpc v1.78.0
6685
google.golang.org/protobuf v1.36.11
86+
>>>>>>> main
6787
>>>>>>> main
6888
gopkg.in/h2non/gock.v1 v1.1.2
6989
gopkg.in/yaml.v3 v3.0.1
@@ -81,8 +101,14 @@ require (
81101
github.com/aymerick/douceur v0.2.0 // indirect
82102
github.com/blang/semver v3.5.1+incompatible // indirect
83103
github.com/catppuccin/go v0.3.0 // indirect
104+
<<<<<<< HEAD
105+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
106+
github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 // indirect
107+
github.com/charmbracelet/bubbletea v1.3.6 // indirect
108+
=======
84109
github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 // indirect
85110
github.com/charmbracelet/bubbletea v1.3.10 // indirect
111+
>>>>>>> main
86112
github.com/charmbracelet/colorprofile v0.3.1 // indirect
87113
github.com/charmbracelet/x/ansi v0.10.2 // indirect
88114
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
@@ -104,6 +130,11 @@ require (
104130
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
105131
github.com/fatih/color v1.18.0 // indirect
106132
github.com/gdamore/encoding v1.0.1 // indirect
133+
<<<<<<< HEAD
134+
github.com/go-chi/chi/v5 v5.2.3 // indirect
135+
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
136+
=======
137+
>>>>>>> main
107138
github.com/go-logr/logr v1.4.3 // indirect
108139
github.com/go-logr/stdr v1.2.2 // indirect
109140
github.com/go-openapi/analysis v0.24.1 // indirect
@@ -189,12 +220,21 @@ require (
189220
go.uber.org/multierr v1.11.0 // indirect
190221
go.uber.org/zap v1.27.0 // indirect
191222
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
223+
<<<<<<< HEAD
224+
golang.org/x/mod v0.29.0 // indirect
225+
golang.org/x/net v0.47.0 // indirect
226+
golang.org/x/oauth2 v0.30.0 // indirect
227+
golang.org/x/sys v0.38.0 // indirect
228+
golang.org/x/time v0.12.0 // indirect
229+
golang.org/x/tools v0.38.0 // indirect
230+
=======
192231
golang.org/x/mod v0.28.0 // indirect
193232
golang.org/x/net v0.45.0 // indirect
194233
golang.org/x/oauth2 v0.30.0 // indirect
195234
golang.org/x/sys v0.37.0 // indirect
196235
golang.org/x/time v0.12.0 // indirect
197236
golang.org/x/tools v0.37.0 // indirect
237+
>>>>>>> main
198238
google.golang.org/api v0.248.0 // indirect
199239
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
200240
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
@@ -204,7 +244,7 @@ require (
204244
go.yaml.in/yaml/v3 v3.0.4 // indirect
205245
golang.org/x/mod v0.30.0 // indirect
206246
golang.org/x/net v0.48.0 // indirect
207-
golang.org/x/sys v0.39.0 // indirect
247+
golang.org/x/sys v0.40.0 // indirect
208248
golang.org/x/tools v0.39.0 // indirect
209249
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
210250
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect

0 commit comments

Comments
 (0)