From e866f92850c8a45db0d6126c3fb18587e88b244b Mon Sep 17 00:00:00 2001 From: Richard Case Date: Tue, 23 Jul 2024 10:05:41 +0100 Subject: [PATCH] chore: changes after org change Signed-off-by: Richard Case --- .github/dependabot.yml | 28 +++++++++++++++++++++++++++ .github/workflows/release.yaml | 10 ++++------ .goreleaser.yaml | 35 +++++++++++++++++++--------------- go.mod | 4 ++-- go.sum | 1 + internal/cmd/app.go | 4 ++-- internal/cmd/microvm/create.go | 6 +++--- internal/cmd/microvm/delete.go | 2 +- internal/cmd/microvm/get.go | 2 +- main.go | 2 +- 10 files changed, 63 insertions(+), 31 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..94bf033 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,28 @@ +version: 2 +updates: + + # Main Go module + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "daily" + labels: + - "kind/cleanup" + - "area/dependency" + groups: + dependencies: + patterns: + - "*" + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + labels: + - "kind/cleanup" + - "area/build-and-release" + + - package-ecosystem: "devcontainers" + directory: "/" + schedule: + interval: weekly \ No newline at end of file diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 846f586..a886f70 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,15 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: - go-version: 1.17.x - - name: Setup Syft - uses: anchore/sbom-action/download-syft@v0 + go-version: 1.22.x - name: Generate release notes run: | gh api repos/{owner}/{repo}/releases/generate-notes -F tag_name=${{ github.ref }} --jq .body > ./changelog.md @@ -30,7 +28,7 @@ jobs: OWNER: ${{ github.repository_owner }} REPO: ${{ github.event.repository.name }} - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v1 + uses: goreleaser/goreleaser-action@v4 with: version: latest args: release --release-notes=./changelog.md --skip-validate diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 916db22..4b3ed26 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,26 +1,31 @@ +version: 2 + before: hooks: - - go mod tidy -compat=1.17 + - go mod tidy - go mod download + builds: - env: - CGO_ENABLED=0 - main: . goos: - linux - darwin - goarch: - - amd64 - - arm64 + archives: - - replacements: - darwin: Darwin - linux: Linux - windows: Windows - 386: i386 - amd64: x86_64 -sboms: - - artifacts: archive + - format: tar.gz + # this name template makes the OS and Arch compatible with the results of `uname`. + name_template: >- + {{ .ProjectName }}_ + {{- title .Os }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else if eq .Arch "386" }}i386 + {{- else }}{{ .Arch }}{{ end }} + {{- if .Arm }}v{{ .Arm }}{{ end }} + # use zip for windows archives + format_overrides: + - goos: windows + format: zip checksum: name_template: 'checksums.txt' snapshot: @@ -32,5 +37,5 @@ changelog: sort: asc filters: exclude: - - '^docs:' - - '^test:' + - "^docs:" + - "^test:" diff --git a/go.mod b/go.mod index e81bb0b..9e98bde 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/weaveworks-liquidmetal/fl +module github.com/liquidmetal-dev/fl -go 1.17 +go 1.22 require ( github.com/moby/moby v20.10.14+incompatible diff --git a/go.sum b/go.sum index d2748ae..d12474c 100644 --- a/go.sum +++ b/go.sum @@ -141,6 +141,7 @@ github.com/moby/moby v20.10.14+incompatible h1:J47P0p+O49F3au8QyE34dE/qXz571kcVm github.com/moby/moby v20.10.14+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= diff --git a/internal/cmd/app.go b/internal/cmd/app.go index f9d9b8b..b859b17 100644 --- a/internal/cmd/app.go +++ b/internal/cmd/app.go @@ -3,8 +3,8 @@ package cmd import ( "github.com/urfave/cli/v2" - "github.com/weaveworks-liquidmetal/fl/internal/cmd/microvm" - "github.com/weaveworks-liquidmetal/fl/pkg/logging" + "github.com/liquidmetal-dev/fl/internal/cmd/microvm" + "github.com/liquidmetal-dev/fl/pkg/logging" ) const ( diff --git a/internal/cmd/microvm/create.go b/internal/cmd/microvm/create.go index 44274b4..093ca49 100644 --- a/internal/cmd/microvm/create.go +++ b/internal/cmd/microvm/create.go @@ -7,7 +7,7 @@ import ( "github.com/urfave/cli/v2" "go.uber.org/zap" - "github.com/weaveworks-liquidmetal/fl/pkg/app" + "github.com/liquidmetal-dev/fl/pkg/app" ) const ( @@ -154,8 +154,8 @@ func newCreateCommand() *cli.Command { }, } - //TODO: additional command line args for kernel - //TODO: add additional volumes + // TODO: additional command line args for kernel + // TODO: add additional volumes return cmd } diff --git a/internal/cmd/microvm/delete.go b/internal/cmd/microvm/delete.go index 26d3749..917959c 100644 --- a/internal/cmd/microvm/delete.go +++ b/internal/cmd/microvm/delete.go @@ -7,7 +7,7 @@ import ( "github.com/urfave/cli/v2" "go.uber.org/zap" - "github.com/weaveworks-liquidmetal/fl/pkg/app" + "github.com/liquidmetal-dev/fl/pkg/app" ) const ( diff --git a/internal/cmd/microvm/get.go b/internal/cmd/microvm/get.go index 5ec7b14..7ae6f41 100644 --- a/internal/cmd/microvm/get.go +++ b/internal/cmd/microvm/get.go @@ -6,7 +6,7 @@ import ( "github.com/urfave/cli/v2" "go.uber.org/zap" - "github.com/weaveworks-liquidmetal/fl/pkg/app" + "github.com/liquidmetal-dev/fl/pkg/app" ) const ( diff --git a/main.go b/main.go index 6374648..5bdd031 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/weaveworks-liquidmetal/fl/internal/cmd" + "github.com/liquidmetal-dev/fl/internal/cmd" ) func main() {