diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml deleted file mode 100644 index c7d3e9498..000000000 --- a/.github/workflows/release-nightly.yml +++ /dev/null @@ -1,33 +0,0 @@ -# .github/workflows/release.yml -name: release-nightly - -on: - workflow_dispatch: - schedule: - - cron: "0 0 * * *" - -jobs: - release: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: setup dependencies - uses: actions/setup-go@v2 - - - name: Login to Docker hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.FLASHBOTS_DOCKERHUB_USERNAME }} - password: ${{ secrets.FLASHBOTS_DOCKERHUB_TOKEN }} - - - name: Create release - run: make release - env: - NIGHTLY: true - GORELEASER_KEY: ${{ secrets.GORELEASERPRO_KEY }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAG: ${{ github.ref_name }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9e7920c49..8791cea64 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,6 +31,5 @@ jobs: - name: Create release run: make release env: - GORELEASER_KEY: ${{ secrets.GORELEASERPRO_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAG: ${{ github.ref_name }} diff --git a/.goreleaser.yaml b/.goreleaser.yaml index e6b0b1311..861cd0e01 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -96,12 +96,8 @@ dockers: - --platform=linux/amd64 image_templates: - "flashbots/suave-geth:{{ .ShortCommit }}-amd64" - - "flashbots/suave-geth:v{{ .Version }}-amd64" - {{- if .IsNightly }} - - flashbots/suave-geth:latest-nightly-amd64 - {{ else }} - - flashbots/suave-geth:latest-amd64 - {{- end }} + - "flashbots/suave-geth:{{ .Tag }}-amd64" + - "flashbots/suave-geth:latest-amd64" - dockerfile: ./Dockerfile.suave use: buildx goarch: arm64 @@ -110,12 +106,8 @@ dockers: - --platform=linux/arm64 image_templates: - "flashbots/suave-geth:{{ .ShortCommit }}-arm64" - - "flashbots/suave-geth:v{{ .Version }}-arm64" - {{- if .IsNightly }} - - flashbots/suave-geth:latest-nightly-arm64 - {{ else }} - - flashbots/suave-geth:latest-arm64 - {{- end }} + - "flashbots/suave-geth:{{ .Tag }}-arm64" + - "flashbots/suave-geth:latest-arm64" docker_manifests: - name_template: "flashbots/suave-geth:{{ .ShortCommit }}" @@ -126,23 +118,10 @@ docker_manifests: image_templates: - "flashbots/suave-geth:{{ .Tag }}-amd64" - "flashbots/suave-geth:{{ .Tag }}-arm64" - {{- if .IsNightly }} - - name_template: "flashbots/suave-geth:latest-nightly" - image_templates: - - "flashbots/suave-geth:latest-nightly-amd64" - - "flashbots/suave-geth:latest-nightly-arm64" - {{ else }} - name_template: "flashbots/suave-geth:latest" image_templates: - - "flashbots/suave-geth:latest-amd64" - - "flashbots/suave-geth:latest-arm64" - {{- end }} - -nightly: - name_template: "{{ incpatch .Version }}-nightly" - tag_name: latest-nightly - publish_release: true - keep_single_release: true + - "flashbots/suave-geth:latest-amd64" + - "flashbots/suave-geth:latest-arm64" checksum: name_template: "checksums.txt" diff --git a/Makefile b/Makefile index 9444589af..7b91be935 100644 --- a/Makefile +++ b/Makefile @@ -56,4 +56,14 @@ fmt-contracts: cd suave && forge fmt release: - ./scripts/release.sh + docker run \ + --rm \ + -e CGO_ENABLED=1 \ + -e GITHUB_TOKEN="$(GITHUB_TOKEN)" \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -v $(HOME)/.docker/config.json:/root/.docker/config.json \ + -v `pwd`:/go/src/$(PACKAGE_NAME) \ + -v `pwd`/sysroot:/sysroot \ + -w /go/src/$(PACKAGE_NAME) \ + ghcr.io/goreleaser/goreleaser-cross:v1.19.5 \ + release --clean --auto-snapshot diff --git a/scripts/release.sh b/scripts/release.sh deleted file mode 100644 index ff64736b3..000000000 --- a/scripts/release.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Conditional assignment of NIGHTLY_FLAG -if [ "$NIGHTLY" = "true" ]; then - NIGHTLY_FLAG="--nightly" -else - NIGHTLY_FLAG="" -fi - -# Docker run command with Bash variables -docker run \ - --rm \ - -e CGO_ENABLED=1 \ - -e GORELEASER_KEY="$GORELEASER_KEY" \ - -e GITHUB_TOKEN="$GITHUB_TOKEN" \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -v "$HOME/.docker/config.json":/root/.docker/config.json \ - -v "$(pwd)":/go/src/"$PACKAGE_NAME" \ - -v "$(pwd)"/sysroot:/sysroot \ - -w /go/src/"$PACKAGE_NAME" \ - ghcr.io/goreleaser/goreleaser-cross-pro:v1.19.5 \ - release --clean --auto-snapshot $NIGHTLY_FLAG