summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRin Kuryloski <kuryloskip@vmware.com>2022-10-18 10:31:34 +0200
committerRin Kuryloski <kuryloskip@vmware.com>2022-10-18 10:31:34 +0200
commit51b8ed40560102654b8d44c6795ca41ac0bb3afd (patch)
treeedbe5a501786d61b550aa178d7e9471f77d8d6c6
parentd70a5e437048f21b1d0d6add502fc5debd6b326e (diff)
downloadrabbitmq-server-git-51b8ed40560102654b8d44c6795ca41ac0bb3afd.tar.gz
Adjustments to the OCI workflow to ensure the correct otp version
is embedded in the OCI
-rw-r--r--.github/workflows/oci.yaml22
1 files changed, 12 insertions, 10 deletions
diff --git a/.github/workflows/oci.yaml b/.github/workflows/oci.yaml
index a44825fb62..c150883106 100644
--- a/.github/workflows/oci.yaml
+++ b/.github/workflows/oci.yaml
@@ -75,8 +75,12 @@ jobs:
run: |
bazelisk build :otp_version :elixir_version \
--config=rbe-${{ matrix.otp_version_id }}
- echo "::set-output name=otp::$(cat bazel-bin/otp_version.txt)"
- echo "::set-output name=elixir::$(cat bazel-bin/elixir_version.txt)"
+ echo "otp=$(cat bazel-bin/otp_version.txt)" >> $GITHUB_OUTPUT
+ echo "elixir=$(cat bazel-bin/elixir_version.txt)" >> $GITHUB_OUTPUT
+
+ # clean so that when we next run bazelisk, the host erlang version
+ # is re-detected
+ bazelisk clean --expunge
- name: Configure OTP & Elixir
uses: erlef/setup-beam@v1.13
@@ -84,25 +88,23 @@ jobs:
otp-version: ${{ steps.load-info.outputs.otp }}
elixir-version: ${{ steps.load-info.outputs.elixir }}
+ - name: Validate otp version embedded in OCI
+ run: |
+ bazel cquery //packaging/docker-image:otp_source --output=build
+
- name: Build
run: |
- export ERLANG_HOME="$(dirname $(dirname $(which erl)))"
- export ELIXIR_HOME="$(dirname $(dirname $(which iex)))"
bazelisk build //packaging/docker-image:rabbitmq \
--config=buildbuddy
- name: Test
run: |
- export ERLANG_HOME="$(dirname $(dirname $(which erl)))"
- export ELIXIR_HOME="$(dirname $(dirname $(which iex)))"
OCI_TESTS=$(bazel query 'tests(//packaging/docker-image/...)')
bazelisk test ${OCI_TESTS} \
--config=buildbuddy
- name: Load
run: |
- export ERLANG_HOME="$(dirname $(dirname $(which erl)))"
- export ELIXIR_HOME="$(dirname $(dirname $(which iex)))"
bazelisk run //packaging/docker-image:rabbitmq \
--config=buildbuddy
@@ -110,9 +112,9 @@ jobs:
id: authorized
run: |
if [ -n "${{ secrets.DOCKERHUB_USERNAME }}" ]; then
- echo "::set-output name=PUSH::true"
+ echo "PUSH=true" >> $GITHUB_OUTPUT
else
- echo "::set-output name=PUSH::false"
+ echo "PUSH=false" >> $GITHUB_OUTPUT
fi
- name: Login to DockerHub