diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83fdfb9..3957eaa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,6 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.18.x - name: Build run: make build diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 7f2f85c..450645e 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -16,7 +16,10 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18.x + uses: sigstore/cosign-installer@main + with: + cosign-release: 'v1.7.1' # optional - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d1dc6b1..13cd86d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,6 +13,6 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.18.x - name: Lint run: make lint diff --git a/.github/workflows/luetrepo.yml b/.github/workflows/luetrepo.yml index 7fd4204..fd03cda 100644 --- a/.github/workflows/luetrepo.yml +++ b/.github/workflows/luetrepo.yml @@ -16,7 +16,7 @@ jobs: uses: docker-practice/actions-setup-docker@0.0.1 - uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.18.x - name: Install and Build 🔧 run: | curl https://get.mocaccino.org/luet/get_luet_root.sh | sudo sh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f498f2c..c86de63 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.18.x - name: Set up Go for root run: | sudo ln -sf `which go` `sudo which go` || true diff --git a/.goreleaser.yml b/.goreleaser.yml index ec3803e..3bc025e 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -12,6 +12,12 @@ builds: - amd64 - arm - arm64 + hooks: + post: + - sh -c "COSIGN_EXPERIMENTAL=1 cosign sign-blob --output dist/{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}.sig {{ .Path }}" +release: + extra_files: + - glob: dist/*.sig source: enabled: true name_template: '{{ .ProjectName }}-{{ .Tag }}-source' diff --git a/go.mod b/go.mod index 254b22c..976116c 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,90 @@ module github.com/itxaka/luet-mtree -go 1.16 +go 1.18 require ( github.com/docker/docker v20.10.0-beta1.0.20201110211921-af34b94a78a1+incompatible github.com/gabriel-vasile/mimetype v1.3.0 github.com/klauspost/compress v1.8.3 - github.com/moby/locker v1.0.1 // indirect - github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect github.com/mudler/go-pluggable v0.0.0-20210513155700-54c6443073af github.com/mudler/luet v0.0.0-20210601205410-5cccc34f32c0 github.com/spf13/cobra v1.1.3 github.com/stretchr/testify v1.6.1 github.com/vbatts/go-mtree v0.5.0 - golang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect gopkg.in/yaml.v2 v2.4.0 ) +require ( + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect + github.com/Microsoft/go-winio v0.4.15-0.20200113171025-3fe6c5262873 // indirect + github.com/Microsoft/hcsshim v0.8.7 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9 // indirect + github.com/containerd/cgroups v0.0.0-20200217135630-d732e370d46d // indirect + github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc // indirect + github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c // indirect + github.com/containerd/ttrpc v0.0.0-20200121165050-0be804eadb15 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/cli v0.0.0-20200227165822-2298e6a3fe24 // indirect + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/docker-credential-helpers v0.6.3 // indirect + github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/genuinetools/img v0.5.11 // indirect + github.com/gofrs/flock v0.7.1 // indirect + github.com/gogo/googleapis v1.3.2 // indirect + github.com/gogo/protobuf v1.3.1 // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.4.2 // indirect + github.com/google/shlex v0.0.0-20150127133951-6f45313302b9 // indirect + github.com/gorilla/mux v1.7.4 // indirect + github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect + github.com/hashicorp/go-immutable-radix v1.0.0 // indirect + github.com/hashicorp/golang-lru v0.5.3 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/klauspost/cpuid v1.2.1 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/miekg/pkcs11 v1.0.2 // indirect + github.com/mitchellh/hashstructure v1.0.0 // indirect + github.com/moby/buildkit v0.7.2 // indirect + github.com/moby/locker v1.0.1 // indirect + github.com/moby/sys/mount v0.2.0 // indirect + github.com/moby/sys/mountinfo v0.4.0 // indirect + github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect + github.com/morikuni/aec v1.0.0 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/opencontainers/runc v1.0.0-rc9.0.20200221051241-688cf6d43cc4 // indirect + github.com/opentracing-contrib/go-stdlib v0.0.0-20180702182724-07a764486eb1 // indirect + github.com/opentracing/opentracing-go v1.1.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.3.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.7.0 // indirect + github.com/prometheus/procfs v0.0.8 // indirect + github.com/sirupsen/logrus v1.7.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/theupdateframework/notary v0.7.0 // indirect + github.com/tonistiigi/fsutil v0.0.0-20200326231323-c2c7d7b0e144 // indirect + go.etcd.io/bbolt v1.3.5 // indirect + go.opencensus.io v0.22.3 // indirect + golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 // indirect + golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 // indirect + golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect + golang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect + google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece // indirect + google.golang.org/grpc v1.29.1 // indirect + google.golang.org/protobuf v1.24.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect +) + replace ( github.com/containerd/containerd v1.4.0-0 => github.com/containerd/containerd v1.4.0 github.com/docker/docker v0.0.0 => github.com/docker/docker v20.10.5+incompatible diff --git a/go.sum b/go.sum index 1f2850d..b383b5a 100644 --- a/go.sum +++ b/go.sum @@ -149,7 +149,6 @@ github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n github.com/cavaliercoder/grab v1.0.1-0.20201108051000-98a5bfe305ec/go.mod h1:NbXoa59CCAGqtRm7kRrcZIk2dTCJMRVF8QI3BOD7isY= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=