diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 24cd9062b8..9839936351 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,9 +80,9 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - uses: goreleaser/goreleaser-action@v4 + - uses: goreleaser/goreleaser-action@v6 with: version: latest - args: release --rm-dist + args: release --clean env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser.yml b/.goreleaser.yml index 255c85c41f..9edda94b6a 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,3 +1,13 @@ +# This is an example .goreleaser.yml file with some sensible defaults. +# Make sure to check the documentation at https://goreleaser.com + +# The lines below are called `modelines`. See `:help modeline` +# Feel free to remove those if you don't want/need to use them. +# yaml-language-server: $schema=https://goreleaser.com/static/schema.json +# vim: set ts=2 sw=2 tw=0 fo=cnqoj + +version: 2 + before: hooks: # You may remove this if you don't use go modules. @@ -10,7 +20,7 @@ snapshot: checksum: name_template: "checksums.txt" changelog: - skip: true + disable: true builds: - id: client @@ -25,7 +35,7 @@ builds: - -s -w - -X github.com/easegress-io/easegress/v2/pkg/version.RELEASE={{ .Tag }} - -X github.com/easegress-io/easegress/v2/pkg/version.COMMIT={{.Commit}} - - -X github.com/easegress-io/easegress/v2/pkg/version.REPO=easegress-io/easegress + - -X github.com/easegress-io/easegress/v2/pkg/version.REPO=chainbase-labs/easegress-providerproxy - id: builder main: cmd/builder/main.go @@ -39,7 +49,7 @@ builds: - -s -w - -X github.com/easegress-io/easegress/v2/pkg/version.RELEASE={{ .Tag }} - -X github.com/easegress-io/easegress/v2/pkg/version.COMMIT={{.Commit}} - - -X github.com/easegress-io/easegress/v2/pkg/version.REPO=easegress-io/easegress + - -X github.com/easegress-io/easegress/v2/pkg/version.REPO=chainbase-labs/easegress-providerproxy - id: server main: cmd/server/main.go @@ -53,7 +63,7 @@ builds: - -s -w - -X github.com/easegress-io/easegress/v2/pkg/version.RELEASE={{ .Tag }} - -X github.com/easegress-io/easegress/v2/pkg/version.COMMIT={{.Commit}} - - -X github.com/easegress-io/easegress/v2/pkg/version.REPO=easegress-io/easegress + - -X github.com/easegress-io/easegress/v2/pkg/version.REPO=chainbase-labs/easegress-providerproxy archives: - id: easegress @@ -64,17 +74,17 @@ archives: release: github: - owner: easegress-io - name: easegress + owner: chainbase-labs + name: easegress-providerproxy name_template: "{{ .ProjectName }}-v{{ .Version }}" dockers: - image_templates: # Still use MegaEase DockerHub account until we have a dedicatd one. - - megaease/easegress:latest - - megaease/easegress:{{ .Tag }} - - megaease/easegress:easemesh - - megaease/easegress:server-sidecar + - h00000000s/easegress:latest + - h00000000s/easegress:{{ .Tag }} + - h00000000s/easegress:easemesh + - h00000000s/easegress:server-sidecar goos: linux goarch: amd64 diff --git a/Makefile b/Makefile index eed1470041..ec1eaffc79 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ GO_PATH := $(shell go env | grep GOPATH | awk -F "=" '{print $$2}' | tr -d "'") INTEGRATION_TEST_PATH := build/test # Image Name -IMAGE_NAME?=megaease/easegress +IMAGE_NAME?=h00000000s/easegress BUILDER_IMAGE_NAME?=megaease/golang:1.21.7-alpine # Version