Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pipelining-followups
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeph Grunschlag committed Aug 29, 2023
2 parents f68c929 + 1ee2e86 commit 35c859c
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 12 deletions.
31 changes: 20 additions & 11 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
env:
- DOCKER_NAME=algorand/conduit
- DOCKER_GITHUB_NAME=algorand/conduit

before:
hooks:
Expand Down Expand Up @@ -37,8 +37,8 @@ dockers:
goos: linux
goarch: amd64
image_templates:
- "{{ .Env.DOCKER_NAME }}:latest{{ if .IsSnapshot }}-snapshot{{ end }}-amd64"
- "{{ .Env.DOCKER_NAME }}:{{ .Version }}-amd64"
- "{{ .Env.DOCKER_GITHUB_NAME }}:latest{{ if .IsSnapshot }}-snapshot{{ end }}-amd64"
- "{{ .Env.DOCKER_GITHUB_NAME }}:{{ .Version }}-amd64"
build_flag_templates:
- --platform=linux/amd64
- --label=org.opencontainers.image.title={{ .ProjectName }}
Expand All @@ -52,8 +52,8 @@ dockers:
goos: linux
goarch: arm64
image_templates:
- "{{ .Env.DOCKER_NAME }}:latest{{ if .IsSnapshot }}-snapshot{{ end }}-arm64"
- "{{ .Env.DOCKER_NAME }}:{{ .Version }}-arm64"
- "{{ .Env.DOCKER_GITHUB_NAME }}:latest{{ if .IsSnapshot }}-snapshot{{ end }}-arm64"
- "{{ .Env.DOCKER_GITHUB_NAME }}:{{ .Version }}-arm64"
build_flag_templates:
- --platform=linux/arm64
- --label=org.opencontainers.image.title={{ .ProjectName }}
Expand All @@ -66,14 +66,14 @@ dockers:

# automatically select amd64/arm64 when using image.
docker_manifests:
- name_template: "{{ .Env.DOCKER_NAME }}:{{ .Version }}"
- name_template: "{{ .Env.DOCKER_GITHUB_NAME }}:{{ .Version }}"
image_templates:
- "{{ .Env.DOCKER_NAME }}:{{ .Version }}-amd64"
- "{{ .Env.DOCKER_NAME }}:{{ .Version }}-arm64"
- name_template: "{{ .Env.DOCKER_NAME }}:latest{{ if .IsSnapshot }}-snapshot{{ end }}"
- "{{ .Env.DOCKER_GITHUB_NAME }}:{{ .Version }}-amd64"
- "{{ .Env.DOCKER_GITHUB_NAME }}:{{ .Version }}-arm64"
- name_template: "{{ .Env.DOCKER_GITHUB_NAME }}:latest{{ if .IsSnapshot }}-snapshot{{ end }}"
image_templates:
- "{{ .Env.DOCKER_NAME }}:latest{{ if .IsSnapshot }}-snapshot{{ end }}-amd64"
- "{{ .Env.DOCKER_NAME }}:latest{{ if .IsSnapshot }}-snapshot{{ end }}-arm64"
- "{{ .Env.DOCKER_GITHUB_NAME }}:latest{{ if .IsSnapshot }}-snapshot{{ end }}-amd64"
- "{{ .Env.DOCKER_GITHUB_NAME }}:latest{{ if .IsSnapshot }}-snapshot{{ end }}-arm64"

archives:
- name_template: >-
Expand All @@ -94,3 +94,12 @@ changelog:
- '^chore:'
- '^docs:'
- '^test:'

release:
draft: true
header: |
![GitHub Logo](https://raw.githubusercontent.com/algorand/go-algorand/master/release/release-banner.jpg)
footer: |
**Full Changelog**: https://github.com/{{ .Env.DOCKER_GITHUB_NAME }}/compare{{ .PreviousTag }}...{{ .Tag }}
---
[Docker images for this release are available on Docker Hub.](https://hub.docker.com/r/algorand/conduit)
2 changes: 1 addition & 1 deletion conduit/plugins/exporters/filewriter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Write block data to files. This plugin works with the file rerader plugin to create a simple file-based pipeine.

The genesis is always exported to a plain JSON file named `genesis.json` regardless of the `FilenamePattern`.
The genesis file is always exported to a plain JSON file named `genesis.json` regardless of the `FilenamePattern`.

## Configuration

Expand Down

0 comments on commit 35c859c

Please sign in to comment.