Skip to content

Commit 45b686c

Browse files
committed
Set commitish to main for perf tool snapshot
They are on a special repository, its only branch is main.
1 parent 40db8b4 commit 45b686c

File tree

3 files changed

+20
-17
lines changed

3 files changed

+20
-17
lines changed

.github/workflows/publish-performance-tool.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
files: packages-latest/*
5151
name: stream-perf-test-latest
5252
tag_name: v-stream-perf-test-latest
53-
target_commitish: ${{ env.release_branch }}
53+
target_commitish: main
5454
prerelease: true
5555
token: ${{ secrets.CI_GITHUB_TOKEN }}
5656
repository: rabbitmq/rabbitmq-java-tools-binaries-dev

.github/workflows/test-3.11-stable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
files: packages/*
6969
name: ${{ env.release_name }}
7070
tag_name: ${{ env.tag_name }}
71-
target_commitish: ${{ env.release_branch }}
71+
target_commitish: main
7272
prerelease: true
7373
token: ${{ secrets.CI_GITHUB_TOKEN }}
7474
repository: rabbitmq/rabbitmq-java-tools-binaries-dev

Dockerfile

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,23 @@ ARG PGP_KEYSERVER=hkps://keys.openpgp.org
4343
ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
4444
ENV STREAM_PERF_TEST_HOME="/stream_perf_test"
4545

46-
RUN set -eux; \
47-
\
48-
wget --progress dot:giga --output-document "/usr/local/src/stream-perf-test.jar.asc" "$stream_perf_test_url.asc"; \
49-
wget --progress dot:giga --output-document "/usr/local/src/stream-perf-test.jar" "$stream_perf_test_url"; \
50-
STREAM_PERF_TEST_SHA256="$(wget -qO- $stream_perf_test_url.sha256)"; \
51-
echo "$STREAM_PERF_TEST_SHA256 /usr/local/src/stream-perf-test.jar" | sha256sum --check --strict -; \
52-
\
53-
export GNUPGHOME="$(mktemp -d)"; \
54-
gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \
55-
gpg --batch --verify "/usr/local/src/stream-perf-test.jar.asc" "/usr/local/src/stream-perf-test.jar"; \
56-
gpgconf --kill all; \
57-
rm -rf "$GNUPGHOME"; \
58-
\
59-
mkdir -p "$STREAM_PERF_TEST_HOME"; \
60-
cp /usr/local/src/stream-perf-test.jar $STREAM_PERF_TEST_HOME/stream-perf-test.jar
46+
#RUN set -eux; \
47+
# \
48+
# wget --progress dot:giga --output-document "/usr/local/src/stream-perf-test.jar.asc" "$stream_perf_test_url.asc"; \
49+
# wget --progress dot:giga --output-document "/usr/local/src/stream-perf-test.jar" "$stream_perf_test_url"; \
50+
# STREAM_PERF_TEST_SHA256="$(wget -qO- $stream_perf_test_url.sha256)"; \
51+
# echo "$STREAM_PERF_TEST_SHA256 /usr/local/src/stream-perf-test.jar" | sha256sum --check --strict -; \
52+
# \
53+
# export GNUPGHOME="$(mktemp -d)"; \
54+
# gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \
55+
# gpg --batch --verify "/usr/local/src/stream-perf-test.jar.asc" "/usr/local/src/stream-perf-test.jar"; \
56+
# gpgconf --kill all; \
57+
# rm -rf "$GNUPGHOME"; \
58+
# \
59+
# mkdir -p "$STREAM_PERF_TEST_HOME"; \
60+
# cp /usr/local/src/stream-perf-test.jar $STREAM_PERF_TEST_HOME/stream-perf-test.jar
61+
62+
COPY target/stream-perf-test.jar $STREAM_PERF_TEST_HOME/stream-perf-test.jar
6163

6264
FROM ubuntu:22.04
6365

@@ -68,6 +70,7 @@ RUN set -eux; \
6870
apt-get install -y --no-install-recommends \
6971
locales \
7072
wget \
73+
jq \
7174
; \
7275
rm -rf /var/lib/apt/lists/*; \
7376
locale-gen en_US.UTF-8

0 commit comments

Comments
 (0)