Skip to content

Commit 2f79d0d

Browse files
committed
* Move publish of go stream perf test docker image to its own workflow
1 parent 80570ca commit 2f79d0d

File tree

3 files changed

+35
-26
lines changed

3 files changed

+35
-26
lines changed

.github/workflows/build_and_test.yml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
- main
1010
workflow_dispatch:
1111

12+
permissions:
13+
contents: read
14+
1215
jobs:
1316
docker-build:
1417
runs-on: ubuntu-latest
@@ -93,23 +96,3 @@ jobs:
9396
- name: Run Ginkgo test suite
9497
shell: pwsh
9598
run: go.exe run -mod=mod github.com/onsi/ginkgo/v2/ginkgo -r --procs=$env:NUMBER_OF_PROCESSORS --compilers=$env:NUMBER_OF_PROCESSORS --randomize-all --randomize-suites --cover --coverprofile=coverage.txt --covermode=atomic --race --trace --tags debug --timeout=5m
96-
publish:
97-
runs-on: ubuntu-latest
98-
needs: test
99-
steps:
100-
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
101-
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
102-
with:
103-
username: ${{ secrets.DOCKERHUB_USERNAME }}
104-
password: ${{ secrets.DOCKERHUB_TOKEN }}
105-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
106-
- name: Publish Docker Image
107-
run: |
108-
set -x
109-
VERSION=latest
110-
export VERSION
111-
if [[ ! $GITHUB_REF =~ "/tags/" ]]
112-
then
113-
VERSION=dev
114-
fi
115-
make perf-test-docker-push
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Publish Go Stream Perf Test
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
workflow_dispatch:
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
publish:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
17+
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
18+
with:
19+
username: ${{ secrets.DOCKERHUB_USERNAME }}
20+
password: ${{ secrets.DOCKERHUB_TOKEN }}
21+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
22+
- name: Publish Docker Image
23+
run: |
24+
set -eux
25+
export VERSION=latest
26+
if [[ ! $GITHUB_REF =~ "/tags/" ]]
27+
then
28+
VERSION=dev
29+
fi
30+
make perf-test-docker-push

Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ perf-test-docker-build: perf-test-build
5757
perf-test-docker-push: perf-test-docker-build
5858
$(BUILDKIT) push pivotalrabbitmq/go-stream-perf-test:$(VERSION)
5959

60-
RABBITMQ_OCI ?= rabbitmq:3-management
60+
RABBITMQ_OCI ?= rabbitmq:4-management
6161
BUILDKIT_RUN_ARGS ?= --pull always
6262
.PHONY: rabbitmq-server
6363
rabbitmq-server:
@@ -67,7 +67,6 @@ rabbitmq-server:
6767
-e RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-rabbitmq_stream advertised_host localhost" \
6868
rabbitmq-tls-test
6969

70-
7170
rabbitmq-ha-proxy:
7271
cd compose/ha_tls; rm -rf tls-gen;
7372
cd compose/ha_tls; git clone https://github.com/michaelklishin/tls-gen tls-gen; cd tls-gen/basic; make
@@ -87,10 +86,7 @@ rabbitmq-server-tls:
8786
-v $(shell pwd)/compose/tls/conf/:/etc/rabbitmq/ -v $(shell pwd)/compose/tls/tls-gen/basic/result/:/certs \
8887
-e RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-rabbitmq_stream advertised_host localhost" \
8988
--pull always \
90-
docker.io/rabbitmq:3-management
89+
docker.io/rabbitmq:4-management
9190

9291
local-release:
9392
goreleaser release --skip-publish --rm-dist --skip=validate
94-
95-
96-

0 commit comments

Comments
 (0)