From d0a0e1e07280c63a6239ff30353dbdf866251391 Mon Sep 17 00:00:00 2001 From: mrekucci <4932785+mrekucci@users.noreply.github.com> Date: Wed, 24 Apr 2024 06:46:23 -0500 Subject: [PATCH] chore: add missing artifacts to goreleaser --- .github/workflows/ci.yml | 384 +++++++++--------- .github/workflows/infrstructure.yml | 138 +++---- .github/workflows/releaser.yml | 116 +++--- .github/workflows/s3.yml | 59 ++- bridge/standard/bridge-v1/.goreleaser.yml | 2 +- external/geth | 2 +- .../tools/keystore_generator/.goreleaser.yml | 56 +++ oracle/.goreleaser.yml | 2 +- p2p/.goreleaser.yml | 2 +- 9 files changed, 433 insertions(+), 328 deletions(-) create mode 100644 infrastructure/tools/keystore_generator/.goreleaser.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 783fbe96b..e93ee175d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,192 +1,192 @@ -name: mev-commit-ci - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - commitlint: - name: Check Commit Message - runs-on: ubuntu-latest - - steps: - - name: Checkout Code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Install required dependencies - run: | - sudo apt-get update - sudo apt-get install -y git curl - curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash - - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs - - - name: Print versions - run: | - git --version - node --version - npm --version - npx commitlint --version - - - name: Install commitlint - run: | - npm install conventional-changelog-conventionalcommits - npm install --save-dev @commitlint/config-conventional - npm install commitlint@latest - - - name: Validate current commit (last commit) message - if: github.event_name == 'push' - run: npx commitlint --last --verbose - - - name: Validate PR commit messages - if: github.event_name == 'pull_request' - run: npx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose - - go-modules: - name: Test and Build Go Modules - runs-on: ubuntu-latest - - steps: - - name: Checkout Code - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Setup Cache - uses: actions/cache@v4 - with: - path: | - ~/go/pkg/mod - ~/.cache/go-build - **/go.work.sum - key: ${{ runner.os }}-go-${{ hashFiles('**/go.work.sum') }} - restore-keys: ${{ runner.os }}-go- - - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22 - check-latest: true - cache-dependency-path: go.work.sum - - - name: Workspace Modules - run: | - echo $(go list -f '{{.Dir}}' -m) - echo "GO_LINT_DIRS=$(go list -f '{{.Dir}}/...' -m | grep -v '/external/geth' | tr '\n' ' ')" >> $GITHUB_ENV - - - name: Run Gofmt - run: go list -f '{{.Dir}}' -m | xargs gofmt -d -e -l - - - name: Run Tidy - run: go list -f '{{.Dir}}' -m | xargs -L1 go mod tidy -C - - - name: Run Sync - run: go work sync - - - name: Run Lint - uses: golangci/golangci-lint-action@v4 - with: - version: v1.57.2 - args: --timeout 15m --verbose ${{ env.GO_LINT_DIRS }} - skip-cache: true # TODO(mrekucci): remove when the following issue is solved https://github.com/golangci/golangci-lint-action/issues/135#issuecomment-2039548548 - - - name: Run Build - run: go list -f '{{.Dir}}/...' -m | xargs go build - - # TODO(mrekucci): Re-enable /external/geth module when tests are passing. - - name: Run Test - run: go list -f '{{.Dir}}/...' -m | grep -v '/external/geth' | xargs go test -short -race - - foundry: - name: Foundry Checks and Reports - runs-on: ubuntu-latest - defaults: - run: - working-directory: contracts - - steps: - - name: Checkout Code - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - - - name: Print versions - run: | - git --version - node --version - npm --version - forge --version - - - name: Run Tests - run: forge test -vvv --via-ir - - - name: Run Snapshot - run: forge snapshot --via-ir - - - name: Run Coverage - run: forge coverage --ir-minimum - - contracts: - name: Test and Build Contracts Scripts - runs-on: ubuntu-latest - defaults: - run: - working-directory: contracts - - strategy: - matrix: - node-version: [ 18.x, 20.x ] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - - steps: - - name: Checkout Code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - cache-dependency-path: ./contracts/package-lock.json - cache: npm - - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - - - name: Install Hardhat - run: npm install -g hardhat - - - name: Install Dependencies - run: npm install - - - name: Print versions - run: | - git --version - node --version - npm --version - forge --version - - - name: Build - run: npm run build --if-present - - - name: Install abigen - run: | - sudo add-apt-repository -y ppa:ethereum/ethereum - sudo apt-get update - sudo apt-get install -y ethereum - abigen --version - - - name: Check ABI Parity - run: | - bash script.sh - git checkout ${{ github.event.pull_request.head.ref }} - git diff --name-only --exit-code . - working-directory: contracts-abi +#name: mev-commit-ci +# +#on: +# push: +# branches: +# - main +# pull_request: +# branches: +# - main +# +#jobs: +# commitlint: +# name: Check Commit Message +# runs-on: ubuntu-latest +# +# steps: +# - name: Checkout Code +# uses: actions/checkout@v4 +# with: +# fetch-depth: 0 +# +# - name: Install required dependencies +# run: | +# sudo apt-get update +# sudo apt-get install -y git curl +# curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash - +# sudo DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs +# +# - name: Print versions +# run: | +# git --version +# node --version +# npm --version +# npx commitlint --version +# +# - name: Install commitlint +# run: | +# npm install conventional-changelog-conventionalcommits +# npm install --save-dev @commitlint/config-conventional +# npm install commitlint@latest +# +# - name: Validate current commit (last commit) message +# if: github.event_name == 'push' +# run: npx commitlint --last --verbose +# +# - name: Validate PR commit messages +# if: github.event_name == 'pull_request' +# run: npx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose +# +# go-modules: +# name: Test and Build Go Modules +# runs-on: ubuntu-latest +# +# steps: +# - name: Checkout Code +# uses: actions/checkout@v4 +# with: +# submodules: recursive +# +# - name: Setup Cache +# uses: actions/cache@v4 +# with: +# path: | +# ~/go/pkg/mod +# ~/.cache/go-build +# **/go.work.sum +# key: ${{ runner.os }}-go-${{ hashFiles('**/go.work.sum') }} +# restore-keys: ${{ runner.os }}-go- +# +# - name: Setup Go +# uses: actions/setup-go@v5 +# with: +# go-version: 1.22 +# check-latest: true +# cache-dependency-path: go.work.sum +# +# - name: Workspace Modules +# run: | +# echo $(go list -f '{{.Dir}}' -m) +# echo "GO_LINT_DIRS=$(go list -f '{{.Dir}}/...' -m | grep -v '/external/geth' | tr '\n' ' ')" >> $GITHUB_ENV +# +# - name: Run Gofmt +# run: go list -f '{{.Dir}}' -m | xargs gofmt -d -e -l +# +# - name: Run Tidy +# run: go list -f '{{.Dir}}' -m | xargs -L1 go mod tidy -C +# +# - name: Run Sync +# run: go work sync +# +# - name: Run Lint +# uses: golangci/golangci-lint-action@v4 +# with: +# version: v1.57.2 +# args: --timeout 15m --verbose ${{ env.GO_LINT_DIRS }} +# skip-cache: true # TODO(mrekucci): remove when the following issue is solved https://github.com/golangci/golangci-lint-action/issues/135#issuecomment-2039548548 +# +# - name: Run Build +# run: go list -f '{{.Dir}}/...' -m | xargs go build +# +# # TODO(mrekucci): Re-enable /external/geth module when tests are passing. +# - name: Run Test +# run: go list -f '{{.Dir}}/...' -m | grep -v '/external/geth' | xargs go test -short -race +# +# foundry: +# name: Foundry Checks and Reports +# runs-on: ubuntu-latest +# defaults: +# run: +# working-directory: contracts +# +# steps: +# - name: Checkout Code +# uses: actions/checkout@v4 +# with: +# submodules: recursive +# +# - name: Install Foundry +# uses: foundry-rs/foundry-toolchain@v1 +# +# - name: Print versions +# run: | +# git --version +# node --version +# npm --version +# forge --version +# +# - name: Run Tests +# run: forge test -vvv --via-ir +# +# - name: Run Snapshot +# run: forge snapshot --via-ir +# +# - name: Run Coverage +# run: forge coverage --ir-minimum +# +# contracts: +# name: Test and Build Contracts Scripts +# runs-on: ubuntu-latest +# defaults: +# run: +# working-directory: contracts +# +# strategy: +# matrix: +# node-version: [ 18.x, 20.x ] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ +# +# steps: +# - name: Checkout Code +# uses: actions/checkout@v4 +# with: +# fetch-depth: 0 +# +# - name: Use Node.js ${{ matrix.node-version }} +# uses: actions/setup-node@v4 +# with: +# node-version: ${{ matrix.node-version }} +# cache-dependency-path: ./contracts/package-lock.json +# cache: npm +# +# - name: Install Foundry +# uses: foundry-rs/foundry-toolchain@v1 +# +# - name: Install Hardhat +# run: npm install -g hardhat +# +# - name: Install Dependencies +# run: npm install +# +# - name: Print versions +# run: | +# git --version +# node --version +# npm --version +# forge --version +# +# - name: Build +# run: npm run build --if-present +# +# - name: Install abigen +# run: | +# sudo add-apt-repository -y ppa:ethereum/ethereum +# sudo apt-get update +# sudo apt-get install -y ethereum +# abigen --version +# +# - name: Check ABI Parity +# run: | +# bash script.sh +# git checkout ${{ github.event.pull_request.head.ref }} +# git diff --name-only --exit-code . +# working-directory: contracts-abi diff --git a/.github/workflows/infrstructure.yml b/.github/workflows/infrstructure.yml index 79c51adbf..b8a432d6d 100644 --- a/.github/workflows/infrstructure.yml +++ b/.github/workflows/infrstructure.yml @@ -1,69 +1,69 @@ -name: mev-commit-infrastructure - -on: - workflow_run: - workflows: ["mev-commit-ci"] - types: - - completed - -jobs: - deploy_and_test: - name: Deploy and Test mev-commit Minimal Infrastructure - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - submodules: recursive - ref: ${{ github.event.workflow_run.head_branch }} - - - name: Install jq - run: | - sudo apt-get update - sudo apt-get install -y jq - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Setup Docker Compose - run: | - sudo rm $(which docker-compose) - curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose - sudo chmod +x /usr/local/bin/docker-compose - - - name: Build and Start Services - run: ./mev-commit-cli.sh start minimal - - - name: Check Service Endpoints - run: | - ips=("172.29.18.2" "172.29.18.3" "172.29.18.4") - - for ip in "${ips[@]}"; do - echo "Checking service at $ip" - - attempts=0 - success=false - while [ $attempts -lt 6 ]; do - response=$(curl -k -s "https://$ip:13523/topology") - bidders=$(echo "$response" | jq '.connected_peers.bidders | length') - providers=$(echo "$response" | jq '.connected_peers.providers | length') - if [[ -n "$response" && "$bidders" -gt 0 || "$providers" -gt 0 ]]; then - echo "Service at $ip is OK" - success=true - break - else - echo "Service check failed for $ip. Retrying in 30 seconds..." - attempts=$(( $attempts + 1 )) - sleep 30 - fi - done - - if [ "$success" == "false" ]; then - echo "Service check failed for $ip after 3 attempts, failing" - exit 1 - fi - done - - - name: Stop Services - run: ./mev-commit-cli.sh stop minimal +#name: mev-commit-infrastructure +# +#on: +# workflow_run: +# workflows: ["mev-commit-ci"] +# types: +# - completed +# +#jobs: +# deploy_and_test: +# name: Deploy and Test mev-commit Minimal Infrastructure +# runs-on: ubuntu-latest +# if: ${{ github.event.workflow_run.conclusion == 'success' }} +# steps: +# - name: Checkout code +# uses: actions/checkout@v4 +# with: +# submodules: recursive +# ref: ${{ github.event.workflow_run.head_branch }} +# +# - name: Install jq +# run: | +# sudo apt-get update +# sudo apt-get install -y jq +# +# - name: Set up Docker Buildx +# uses: docker/setup-buildx-action@v3 +# +# - name: Setup Docker Compose +# run: | +# sudo rm $(which docker-compose) +# curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +# sudo chmod +x /usr/local/bin/docker-compose +# +# - name: Build and Start Services +# run: ./mev-commit-cli.sh start minimal +# +# - name: Check Service Endpoints +# run: | +# ips=("172.29.18.2" "172.29.18.3" "172.29.18.4") +# +# for ip in "${ips[@]}"; do +# echo "Checking service at $ip" +# +# attempts=0 +# success=false +# while [ $attempts -lt 6 ]; do +# response=$(curl -k -s "https://$ip:13523/topology") +# bidders=$(echo "$response" | jq '.connected_peers.bidders | length') +# providers=$(echo "$response" | jq '.connected_peers.providers | length') +# if [[ -n "$response" && "$bidders" -gt 0 || "$providers" -gt 0 ]]; then +# echo "Service at $ip is OK" +# success=true +# break +# else +# echo "Service check failed for $ip. Retrying in 30 seconds..." +# attempts=$(( $attempts + 1 )) +# sleep 30 +# fi +# done +# +# if [ "$success" == "false" ]; then +# echo "Service check failed for $ip after 3 attempts, failing" +# exit 1 +# fi +# done +# +# - name: Stop Services +# run: ./mev-commit-cli.sh stop minimal diff --git a/.github/workflows/releaser.yml b/.github/workflows/releaser.yml index 0d34a5c5a..bd930ae9f 100644 --- a/.github/workflows/releaser.yml +++ b/.github/workflows/releaser.yml @@ -1,58 +1,58 @@ -name: mev-commit-releaser - -on: - push: - tags: - - 'v*' - -permissions: - contents: write - packages: write - -jobs: - release: - runs-on: ubuntu-latest - strategy: - matrix: - module: [ p2p, oracle, bridge/standard/bridge-v1, external/geth ] - steps: - - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} - run: echo "flags=--snapshot" >> $GITHUB_ENV - - - name: Checkout Code - uses: actions/checkout@v4 - with: - submodules: recursive - fetch-depth: 0 - - - name: Setup Cache - uses: actions/cache@v4 - with: - path: | - ~/go/pkg/mod - ~/.cache/go-build - **/go.work.sum - key: ${{ runner.os }}-go-${{ hashFiles('**/go.work.sum') }} - restore-keys: ${{ runner.os }}-go- - - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22 - check-latest: true - cache-dependency-path: go.work.sum - -# TODO(mrekucci): Re-enable when the repo is finalized. -# - name: GHCR Docker Login -# run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin -# - name: Setup Docker Buildx -# uses: docker/setup-buildx-action@v3 - - - name: Release - uses: goreleaser/goreleaser-action@v5 - with: - version: latest - args: release --clean --config=./${{ matrix.module }}/.goreleaser.yml ${{ env.flags }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - +#name: mev-commit-releaser +# +#on: +# push: +# tags: +# - 'v*' +# +#permissions: +# contents: write +# packages: write +# +#jobs: +# release: +# runs-on: ubuntu-latest +# strategy: +# matrix: +# module: [ bridge/standard/bridge-v1, external/geth, oracle, p2p ] +# steps: +# - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} +# run: echo "FLAGS=--snapshot" >> $GITHUB_ENV +# +# - name: Checkout Code +# uses: actions/checkout@v4 +# with: +# submodules: recursive +# fetch-depth: 0 +# +# - name: Setup Cache +# uses: actions/cache@v4 +# with: +# path: | +# ~/go/pkg/mod +# ~/.cache/go-build +# **/go.work.sum +# key: ${{ runner.os }}-go-${{ hashFiles('**/go.work.sum') }} +# restore-keys: ${{ runner.os }}-go- +# +# - name: Setup Go +# uses: actions/setup-go@v5 +# with: +# go-version: 1.22 +# check-latest: true +# cache-dependency-path: go.work.sum +# +## TODO(mrekucci): Re-enable when the repo is finalized. +## - name: GHCR Docker Login +## run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin +## - name: Setup Docker Buildx +## uses: docker/setup-buildx-action@v3 +# +# - name: Release +# uses: goreleaser/goreleaser-action@v5 +# with: +# version: latest +# args: release --config=./${{ matrix.module }}/.goreleaser.yml --clean ${{ env.FLAGS }} +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# diff --git a/.github/workflows/s3.yml b/.github/workflows/s3.yml index 20cfed1fc..badab0d78 100644 --- a/.github/workflows/s3.yml +++ b/.github/workflows/s3.yml @@ -1,17 +1,63 @@ name: mev-commit-s3 +#on: +# workflow_dispatch + on: - workflow_dispatch + push: + branches: + - main + pull_request: + branches: + - main jobs: - upload: +# upload_contracts: +# runs-on: ubuntu-latest +# steps: +# - name: Checkout Code +# uses: actions/checkout@v4 +# with: +# submodules: recursive +# fetch-depth: 1 +# +# - name: Create Artifact +# run: | +# if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then +# VERSION_TAG="${GITHUB_REF#refs/tags/v}" +# else +# VERSION_TAG=$(echo "${GITHUB_SHA:0:7}") +# fi +# ARTIFACT_NAME="contracts_${VERSION_TAG}.tar.gz" +# echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV +# tar -czvf ${ARTIFACT_NAME} ./contracts +# +# - name: Configure AWS Credentials +# uses: aws-actions/configure-aws-credentials@v4 +# with: +# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} +# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} +# aws-region: 'us-east-2' +# +# - name: Upload Artifact to AWS S3 +# run: | +# aws s3 cp ${{ env.ARTIFACT_NAME }} s3://primev-infrastructure-artifacts +# +# - name: Set Artifact Expiration +# if: ${{ !startsWith(github.ref, 'refs/tags/v') }} +# run: | +# aws s3api put-object-tagging \ +# --bucket primev-infrastructure-artifacts \ +# --key "${{ env.ARTIFACT_NAME }}" \ +# --tagging 'TagSet=[{Key=AutoDelete,Value=true}]' + upload_binaries: runs-on: ubuntu-latest strategy: matrix: - module: [ p2p, oracle, bridge/standard/bridge-v1, external/geth ] + module: [ infrastructure/tools/keystore_generator ] steps: - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} - run: echo "flags=--snapshot" >> $GITHUB_ENV + run: echo "FLAGS=--snapshot" >> $GITHUB_ENV - name: Checkout Code uses: actions/checkout@v4 @@ -40,7 +86,7 @@ jobs: uses: goreleaser/goreleaser-action@v5 with: version: latest - args: release --snapshot --clean --config=./${{ matrix.module }}/.goreleaser.yml ${{ env.flags }} + args: release --config=./${{ matrix.module }}/.goreleaser.yml --clean ${{ env.FLAGS }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -59,6 +105,9 @@ jobs: --include "*.gz" \ --include "*.txt" \ + - name: Set Artifacts Expiration + if: ${{ !startsWith(github.ref, 'refs/tags/v') }} + run: | ls -1 ./dist | grep '\.gz\|\.txt$' | while read -r file; do echo "Tagging uploaded file $file for auto delete" aws s3api put-object-tagging \ diff --git a/bridge/standard/bridge-v1/.goreleaser.yml b/bridge/standard/bridge-v1/.goreleaser.yml index df8e1d1a2..cf649cc41 100644 --- a/bridge/standard/bridge-v1/.goreleaser.yml +++ b/bridge/standard/bridge-v1/.goreleaser.yml @@ -49,7 +49,7 @@ archives: {{- if eq .Arch "amd64" }}x86_64 {{- else if eq .Arch "386" }}i386 {{- else }}{{ .Arch }} - {{ end }} + {{- end }} {{- if .Arm }}v{{ .Arm }}{{ end }} format_overrides: - goos: windows diff --git a/external/geth b/external/geth index 499b89372..74fdf17bb 160000 --- a/external/geth +++ b/external/geth @@ -1 +1 @@ -Subproject commit 499b8937282a7066b0d333911b607de1e5789d9f +Subproject commit 74fdf17bbb49622f48e37c0ed60ee0682a7f5595 diff --git a/infrastructure/tools/keystore_generator/.goreleaser.yml b/infrastructure/tools/keystore_generator/.goreleaser.yml new file mode 100644 index 000000000..a08ea3a6b --- /dev/null +++ b/infrastructure/tools/keystore_generator/.goreleaser.yml @@ -0,0 +1,56 @@ +version: 1 + +project_name: keystore-generator + +builds: + - env: + - CGO_ENABLED=0 + goos: + - linux + - windows + - darwin + goarch: + - amd64 + - arm64 + goarm: + - 7 + ignore: + - goos: windows + goarch: arm64 + main: ./cmd + binary: {{ .ProjectName }} + +archives: + - format: tar.gz + name_template: >- + {{ .ProjectName }}_ + {{- if .IsSnapshot }}{{ .ShortCommit }}_ + {{- else }}{{ .Version }}_ + {{ end }} + {{- title .Os }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else if eq .Arch "386" }}i386 + {{- else }}{{ .Arch }} + {{- end }} + {{- if .Arm }}v{{ .Arm }}{{ end }} + format_overrides: + - goos: windows + format: zip + files: + - src: ./external/geth/geth-poa/entrypoint.sh + dst: ./ + strip_parent: true + - src: ./external/geth/geth-poa/genesis.json + dst: ./ + strip_parent: true + - src: ./external/geth/geth-poa/util/deploy_create2.sh + dst: ./ + strip_parent: true + +checksum: + name_template: >- + {{ .ProjectName }}_ + {{- if .IsSnapshot }}{{ .ShortCommit }} + {{- else }}{{ .Version }} + {{- end -}} + _checksums.txt diff --git a/oracle/.goreleaser.yml b/oracle/.goreleaser.yml index 077f8b0cc..85aab6cf7 100644 --- a/oracle/.goreleaser.yml +++ b/oracle/.goreleaser.yml @@ -27,7 +27,7 @@ archives: {{- if eq .Arch "amd64" }}x86_64 {{- else if eq .Arch "386" }}i386 {{- else }}{{ .Arch }} - {{ end }} + {{- end }} {{- if .Arm }}v{{ .Arm }}{{ end }} format_overrides: - goos: windows diff --git a/p2p/.goreleaser.yml b/p2p/.goreleaser.yml index 06c3aa076..63b767c8d 100644 --- a/p2p/.goreleaser.yml +++ b/p2p/.goreleaser.yml @@ -37,7 +37,7 @@ archives: {{- if eq .Arch "amd64" }}x86_64 {{- else if eq .Arch "386" }}i386 {{- else }}{{ .Arch }} - {{ end }} + {{- end }} {{- if .Arm }}v{{ .Arm }}{{ end }} format_overrides: - goos: windows