From 2209d7b704724276603ed1fbc07deea4f0542689 Mon Sep 17 00:00:00 2001 From: sturman <4456572+sturman@users.noreply.github.com> Date: Mon, 16 Dec 2024 18:48:48 +0200 Subject: [PATCH 1/2] ci: update GitHub Actions --- .github/workflows/ci.yml | 14 +++++++------- .github/workflows/docker.yml | 10 +++++----- .github/workflows/goreleaser.yml | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eceb7f72f..1a782fe23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,8 @@ jobs: name: build (${{ matrix.os }}/go-${{ matrix.go-version }}) runs-on: ${{ matrix.os }}-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v2 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0 with: go-version: ${{ matrix.go-version }} @@ -45,7 +45,7 @@ jobs: runs-on: ${{ matrix.os }}-latest services: minio: - image: ${{ (matrix.os == 'ubuntu') && 'bitnami/minio:2023.7.18' || ''}} + image: ${{ (matrix.os == 'ubuntu') && 'public.ecr.aws/bitnami/minio:2025.2.7' || ''}} ports: - 45677:9000 options: >- @@ -57,8 +57,8 @@ jobs: MINIO_ROOT_USER: minioadmin MINIO_ROOT_PASSWORD: minioadmin steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v2 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0 with: go-version: ${{ matrix.go-version }} @@ -77,8 +77,8 @@ jobs: runs-on: ${{ matrix.os }}-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v2 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0 with: go-version: ${{ matrix.go-version }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 01c101e78..89736cb49 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -8,22 +8,22 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 with: context: . file: ./Dockerfile diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 56a75b477..fd16d8936 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -8,8 +8,8 @@ jobs: name: gcs-test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v2 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0 with: go-version: 1.22.x - run: make test_without_race @@ -27,19 +27,19 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0 with: go-version: '1.22' - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v2 + uses: goreleaser/goreleaser-action@1a80836c5c9d9e5755a25cb59ec6f45a3b5f41a8 # v7.2.1 with: - version: '1.18.2' - args: release --rm-dist + version: '~> v2' + args: release --clean env: GITHUB_TOKEN: ${{ secrets.GORELEASER_TOKEN }} From 6a26f1d29f9c52e81048245de64bda52dd550eba Mon Sep 17 00:00:00 2001 From: Roman <4456572+sturman@users.noreply.github.com> Date: Tue, 28 Apr 2026 08:38:58 +0300 Subject: [PATCH 2/2] chore: update goreleaser configuration --- .goreleaser.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 7d206c115..44bbedf39 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,3 +1,5 @@ +version: 2 + before: hooks: - make build @@ -22,22 +24,25 @@ builds: goarch: 386 archives: - - name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}' - replacements: - darwin: macOS - linux: Linux - windows: Windows - 386: 32bit - amd64: 64bit + - name_template: >- + {{ .ProjectName }}_{{ .Version }}_ + {{- if eq .Os "darwin" }}macOS + {{- else if eq .Os "linux" }}Linux + {{- else if eq .Os "windows" }}Windows + {{- else }}{{ .Os }}{{ end }}- + {{- if eq .Arch "386" }}32bit + {{- else if eq .Arch "amd64" }}64bit + {{- else }}{{ .Arch }}{{ end }} + {{- if .Arm }}v{{ .Arm }}{{ end }} format_overrides: - goos: windows - format: zip + formats: [zip] checksum: name_template: '{{ .ProjectName }}_checksums.txt' snapshot: - name_template: "{{ .Tag }}" + version_template: "{{ .Tag }}" changelog: sort: asc @@ -49,10 +54,10 @@ changelog: - Merge branch brews: - - tap: + - repository: owner: peak name: homebrew-tap - folder: Formula + directory: Formula name: s5cmd description: Parallel S3 and local filesystem execution tool homepage: https://github.com/peak/s5cmd