Skip to content

Commit

Permalink
Merge pull request #8 from liquidmetal-dev/org_change
Browse files Browse the repository at this point in the history
chore: changes after org change
  • Loading branch information
richardcase authored Jul 23, 2024
2 parents c22d4d3 + e866f92 commit 8077fc5
Show file tree
Hide file tree
Showing 10 changed files with 63 additions and 31 deletions.
28 changes: 28 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 4 additions & 6 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
35 changes: 20 additions & 15 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -32,5 +37,5 @@ changelog:
sort: asc
filters:
exclude:
- '^docs:'
- '^test:'
- "^docs:"
- "^test:"
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions internal/cmd/microvm/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion internal/cmd/microvm/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/microvm/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"time"

"github.com/weaveworks-liquidmetal/fl/internal/cmd"
"github.com/liquidmetal-dev/fl/internal/cmd"
)

func main() {
Expand Down

0 comments on commit 8077fc5

Please sign in to comment.