Merge pull request #1838 from mrpalide/fix/change-goreleaser-depracat…

…ed-flags fix release pipeline issues
skycoin · Jun 25, 2024 · 23b17cc · 23b17cc
2 parents 54b9979 + abe5e38
commit 23b17cc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,10 +8,10 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: 1.21.x
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Requirements
         run: |
           sudo apt update
@@ -26,10 +26,10 @@ jobs:
     needs: linux
     runs-on: macos-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: 1.21.x
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Requirements
         run: |
           brew install goreleaser
@@ -46,10 +46,10 @@ jobs:
     needs: darwin
     runs-on: windows-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: 1.21.x
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Requirements
         shell: pwsh
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,10 +4,10 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: 1.21.x
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Requirements
         run: |
           curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
@@ -23,10 +23,10 @@ jobs:
   darwin:
     runs-on: macos-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: 1.21.x
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Requirements
         run: |
           curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
@@ -42,10 +42,10 @@ jobs:
   windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: 1.21.x
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Requirements
         run: |
           choco install make

diff --git a/Makefile b/Makefile
@@ -196,11 +196,11 @@ format-windows: tidy ## Formats the code. Must have goimports and goimports-revi
 dep: tidy ## Sorts dependencies
 	${OPTS} go mod vendor -v
 
-snapshot: ## goreleaser --snapshot --skip-publish --rm-dist
-	goreleaser --snapshot --skip-publish --rm-dist
+snapshot: ## goreleaser --snapshot --skip-publish --clean
+	goreleaser --snapshot --skip-publish --clean
 
-snapshot-linux: ## 	goreleaser --snapshot --config .goreleaser-linux.yml --skip-publish --rm-dist
-	goreleaser --snapshot --config .goreleaser-linux.yml --skip-publish --rm-dist
+snapshot-linux: ## 	goreleaser --snapshot --config .goreleaser-linux.yml --skip-publish --clean
+	goreleaser --snapshot --config .goreleaser-linux.yml --skip-publish --clean
 
 snapshot-clean: ## Cleans snapshot / release
 	rm -rf ./dist
@@ -246,10 +246,10 @@ github-prepare-release:
 	sed '/^## ${GITHUB_TAG}$$/,/^## .*/!d;//d;/^$$/d' ./CHANGELOG.md > releaseChangelog.md
 
 github-release: github-prepare-release
-	goreleaser --rm-dist --config .goreleaser-linux.yml --release-notes releaseChangelog.md
+	goreleaser --clean --config .goreleaser-linux.yml --release-notes releaseChangelog.md
 
 github-release-darwin:
-	goreleaser --rm-dist  --config .goreleaser-darwin.yml --skip-publish
+	goreleaser --clean  --config .goreleaser-darwin.yml --skip-publish
 	$(eval GITHUB_TAG=$(shell git describe --abbrev=0 --tags))
 	gh release upload --repo skycoin/skywire ${GITHUB_TAG} ./dist/skywire-${GITHUB_TAG}-darwin-amd64.tar.gz
 	gh release upload --repo skycoin/skywire ${GITHUB_TAG} ./dist/skywire-${GITHUB_TAG}-darwin-arm64.tar.gz
@@ -258,7 +258,7 @@ github-release-darwin:
 	gh release upload --repo skycoin/skywire ${GITHUB_TAG} --clobber ./checksums.txt
 
 github-release-windows:
-	.\goreleaser\goreleaser.exe --rm-dist  --config .goreleaser-windows.yml --skip-publish
+	.\goreleaser\goreleaser.exe --clean  --config .goreleaser-windows.yml --skip-publish
 	$(eval GITHUB_TAG=$(shell powershell git describe --abbrev=0 --tags))
 	gh release upload --repo skycoin/skywire ${GITHUB_TAG} ./dist/skywire-${GITHUB_TAG}-windows-amd64.zip
 	gh release upload --repo skycoin/skywire ${GITHUB_TAG} ./dist/skywire-${GITHUB_TAG}-windows-386.zip