From f06cd2ed8c053a79911f82080a1b928971a16e04 Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Tue, 18 Jun 2024 10:30:04 +0530 Subject: [PATCH 1/3] fix/ci: remove spacing in workflow step, update build target in Makefile Signed-off-by: K.B.Dharun Krishna --- .github/workflows/build.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f24dcec..b15d3fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,5 +26,5 @@ jobs: - name: Build plugins run: | - go get ./... + go get ./... make build-plugins diff --git a/Makefile b/Makefile index ead2b2a..b2d720b 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ build: sed 's|$$INSTALLPREFIX$$|${PREFIX}|g' core/plugins.in > core/plugins.go go build -a -o build/${BINARY_NAME} -plugins: FORCE +build-plugins: FORCE mkdir -p build/plugins $(MAKE) -C plugins/ From 70a3d233d633a58d2e459d8c4cdd217254e76c75 Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Tue, 18 Jun 2024 22:15:49 +0530 Subject: [PATCH 2/3] feat/deps: update Go to 1.22 Signed-off-by: K.B.Dharun Krishna --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 13 ++++++++++++- .gitignore | 3 ++- go.mod | 12 ++++++------ go.sum | 7 +++++++ 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b15d3fe..960d2b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.21 + go-version: 1.22 - name: Build vib run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 082e3c1..70c9548 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,6 +8,10 @@ on: jobs: build: runs-on: ubuntu-latest + permissions: + contents: write # to upload assets to releases + attestations: write # to upload assets attestation for build provenance + id-token: write # grant additional permission to attestation action to mint the OIDC token permission steps: - uses: actions/checkout@v4 @@ -15,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.21 + go-version: 1.22 - name: Build run: | @@ -35,3 +39,10 @@ jobs: files: | build/vib plugins.tar.xz + + - name: Attest generated files + if: github.repository == 'Vanilla-OS/Vib' + id: attest + uses: actions/attest-build-provenance@v1 + with: + subject-path: 'build/vib, plugins.tar.xz' diff --git a/.gitignore b/.gitignore index 8129444..56da0e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +core/plugins.go example/downloads/* example/sources/* test/* @@ -5,4 +6,4 @@ build docs/website/dist/* docs/website/node_modules/* go.work -*~ \ No newline at end of file +*~ diff --git a/go.mod b/go.mod index 15098a5..a92eb3e 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,22 @@ module github.com/vanilla-os/vib -go 1.21 +go 1.22 -require github.com/spf13/cobra v1.8.0 +require github.com/spf13/cobra v1.8.1 require ( github.com/ebitengine/purego v0.7.1 github.com/mitchellh/mapstructure v1.5.0 ) -require golang.org/x/sys v0.7.0 // indirect +require golang.org/x/sys v0.21.0 // indirect require ( - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.6.0 github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/vanilla-os/vib/api v0.0.0-20240331150207-852011e4d96f + github.com/vanilla-os/vib/api v0.0.0-20240618053016-44e9ee99064a gopkg.in/yaml.v3 v3.0.1 ) -replace github.com/vanilla-os/vib/api => ./api \ No newline at end of file +replace github.com/vanilla-os/vib/api => ./api diff --git a/go.sum b/go.sum index 1b2a1a6..7aaafa3 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,11 @@ github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/ebitengine/purego v0.7.1 h1:6/55d26lG3o9VCZX8lping+bZcmShseiqlh2bnUDiPA= github.com/ebitengine/purego v0.7.1/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= @@ -10,12 +13,16 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/vanilla-os/vib/api v0.0.0-20240331150207-852011e4d96f h1:sRPpotRlyj3Qx4ftt5oYf7JQuIYTQwwPq93xomWaIKQ= github.com/vanilla-os/vib/api v0.0.0-20240331150207-852011e4d96f/go.mod h1:vjJzDfFxfFHN5O2hcMwGM9De3+H9gGa00Pr3Um6EmCA= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= From 5c283f55b90de31071b3ae8d6293054c8e3c44cb Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Tue, 18 Jun 2024 22:29:14 +0530 Subject: [PATCH 3/3] cleanup/fix: update workflows Signed-off-by: K.B.Dharun Krishna --- .github/workflows/build.yml | 8 ++++++++ .github/workflows/release.yml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 960d2b5..b528ac4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,3 +28,11 @@ jobs: run: | go get ./... make build-plugins + tar cvf plugins.tar.xz build/plugins + + - uses: actions/upload-artifact@v4 + with: + name: Vib + path: | + build/vib + plugins.tar.xz diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 70c9548..f96618a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: - name: Build run: | - Go get ./... + go get ./... make build - name: Build plugins