From a4c18f118e534c32aeea39e27e7a418657c23a5d Mon Sep 17 00:00:00 2001 From: Mohammed Date: Tue, 25 Jun 2024 05:57:18 +0000 Subject: [PATCH 1/3] change --rm-dist to --clean in goreleaser commands --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 6fa72192c7..cf52e8113d 100644 --- 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 From c97e96f544a861104787ebcdb83d94470ae1267d Mon Sep 17 00:00:00 2001 From: Mohammed Date: Tue, 25 Jun 2024 06:01:31 +0000 Subject: [PATCH 2/3] use checkout@v4 for new version of node --- .github/workflows/release.yml | 8 ++++---- .github/workflows/test.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 683687fd02..6262ecb317 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/setup-go@v3 with: go-version: 1.21.x - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Requirements run: | sudo apt update @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-go@v3 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@v 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 index b9b27bfe40..3583b8ccb6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/setup-go@v3 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 @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-go@v3 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 @@ -45,7 +45,7 @@ jobs: - uses: actions/setup-go@v3 with: go-version: 1.21.x - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Requirements run: | choco install make From abe5e3824ef417e57cdddde1db4a5fb3e942347d Mon Sep 17 00:00:00 2001 From: Mohammed Date: Tue, 25 Jun 2024 06:08:44 +0000 Subject: [PATCH 3/3] update setup-go@v4 --- .github/workflows/release.yml | 6 +++--- .github/workflows/test.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6262ecb317..2cb1dff85a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ 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@v4 @@ -26,7 +26,7 @@ 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@v4 @@ -46,7 +46,7 @@ jobs: needs: darwin runs-on: windows-latest steps: - - uses: actions/setup-go@v + - uses: actions/setup-go@v4 with: go-version: 1.21.x - uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3583b8ccb6..9247b67e6f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ 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@v4 @@ -23,7 +23,7 @@ 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@v4 @@ -42,7 +42,7 @@ 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@v4