Skip to content

Commit f7da6c0

Browse files
HoloRinHoloRin
authored
Merge pull request #11500 from rabbitmq/mergify/bp/v3.12.x/pr-11488
Remove remaining buildbuddy usage (backport #11478) (backport #11488)
2 parents 52be6df + af05892 commit f7da6c0

9 files changed

+81
-213
lines changed

‎.github/workflows/perform-bazel-execution-comparison.yaml

-111
This file was deleted.

‎.github/workflows/templates/test-mixed-versions.template.yaml

+23-16
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ jobs:
7676
fi
7777
echo "exists=${exists}" | tee $GITHUB_ENV
7878
79-
OTP_VERSION_ID=${ARCHIVE_URL#*secondary-umbrellas/rbe-}
80-
OTP_VERSION_ID=${OTP_VERSION_ID%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz}
81-
echo "otp_version_id=${OTP_VERSION_ID}" | tee -a $GITHUB_OUTPUT
79+
OTP_VERSION=${ARCHIVE_URL#*secondary-umbrellas/}
80+
OTP_VERSION=${OTP_VERSION%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz}
81+
echo "otp_version=${OTP_VERSION}" | tee -a $GITHUB_OUTPUT
8282
8383
VERSION=${ARCHIVE_URL#*package-generic-unix-for-mixed-version-testing-v}
8484
VERSION=${VERSION%*.tar.xz}
@@ -89,35 +89,42 @@ jobs:
8989
with:
9090
ref: v${{ steps.check.outputs.version }}
9191
path: secondary-umbrella
92+
- name: CONFIGURE OTP & ELIXIR
93+
if: env.exists != 'true'
94+
uses: erlef/[email protected]
95+
with:
96+
otp-version: ${{ steps.check.outputs.otp_version }}
97+
elixir-version: 1.14
98+
hexpm-mirrors: |
99+
https://builds.hex.pm
100+
https://cdn.jsdelivr.net/hex
101+
- name: AUTHENTICATE TO GOOGLE CLOUD
102+
uses: google-github-actions/[email protected]
103+
with:
104+
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
92105
- name: BUILD SECONDARY UMBRELLA ARCHIVE
93106
if: env.exists != 'true'
94107
working-directory: secondary-umbrella
95108
run: |
96-
if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
109+
if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
97110
cat << EOF >> user.bazelrc
98-
build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
99-
EOF
100-
fi
101-
cat << EOF >> user.bazelrc
102-
build:buildbuddy --build_metadata=ROLE=CI
103-
build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
104-
build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-secondary-umbrella
105-
build:buildbuddy --color=yes
111+
build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
112+
build --google_default_credentials
106113
107-
build:buildbuddy --remote_download_toplevel
114+
build --remote_download_toplevel
108115
EOF
116+
fi
109117
110118
sed -i"_orig" -E "/APP_VERSION/ s/3\.[0-9]+\.[0-9]+/${{ steps.check.outputs.version }}/" rabbitmq.bzl
111119
bazelisk build :package-generic-unix \
112-
--config=rbe-${{ steps.check.outputs.otp_version_id }} \
113120
--test_build \
114121
--verbose_failures
115122
116123
OUTPUT_DIR=${{ github.workspace }}/output
117-
mkdir -p ${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}
124+
mkdir -p ${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}
118125
cp \
119126
bazel-bin/package-generic-unix.tar.xz \
120-
${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
127+
${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
121128
- name: UPLOAD THE ARCHIVE TO S3
122129
if: env.exists != 'true'
123130
uses: jakejarvis/[email protected]

‎.github/workflows/test-authnz.yaml

+15-7
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,32 @@ jobs:
5252
with:
5353
otp-version: ${{ matrix.erlang_version }}
5454
elixir-version: ${{ matrix.elixir_version }}
55+
hexpm-mirrors: |
56+
https://builds.hex.pm
57+
https://cdn.jsdelivr.net/hex
58+
59+
- name: Authenticate To Google Cloud
60+
uses: google-github-actions/[email protected]
61+
with:
62+
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
5563

5664
- name: Configure Bazel
5765
run: |
58-
if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
66+
if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
5967
cat << EOF >> user.bazelrc
60-
build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
68+
build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
69+
build --google_default_credentials
70+
71+
build --remote_download_toplevel
6172
EOF
6273
fi
6374
cat << EOF >> user.bazelrc
64-
build:buildbuddy --build_metadata=ROLE=CI
65-
build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
66-
build:buildbuddy --color=yes
75+
build --color=yes
6776
EOF
6877
6978
- name: Build & Load RabbitMQ OCI
7079
run: |
71-
bazelisk run packaging/docker-image:rabbitmq-amd64 \
72-
--config=buildbuddy
80+
bazelisk run packaging/docker-image:rabbitmq-amd64
7381
7482
- name: Configure Docker Network
7583
run: |

‎.github/workflows/test-erlang-git.yaml

-40
This file was deleted.

‎.github/workflows/test-mixed-versions.yaml

+23-16
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ jobs:
5454
fi
5555
echo "exists=${exists}" | tee $GITHUB_ENV
5656
57-
OTP_VERSION_ID=${ARCHIVE_URL#*secondary-umbrellas/rbe-}
58-
OTP_VERSION_ID=${OTP_VERSION_ID%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz}
59-
echo "otp_version_id=${OTP_VERSION_ID}" | tee -a $GITHUB_OUTPUT
57+
OTP_VERSION=${ARCHIVE_URL#*secondary-umbrellas/}
58+
OTP_VERSION=${OTP_VERSION%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz}
59+
echo "otp_version=${OTP_VERSION}" | tee -a $GITHUB_OUTPUT
6060
6161
VERSION=${ARCHIVE_URL#*package-generic-unix-for-mixed-version-testing-v}
6262
VERSION=${VERSION%*.tar.xz}
@@ -67,35 +67,42 @@ jobs:
6767
with:
6868
ref: v${{ steps.check.outputs.version }}
6969
path: secondary-umbrella
70+
- name: CONFIGURE OTP & ELIXIR
71+
if: env.exists != 'true'
72+
uses: erlef/[email protected]
73+
with:
74+
otp-version: ${{ steps.check.outputs.otp_version }}
75+
elixir-version: 1.14
76+
hexpm-mirrors: |
77+
https://builds.hex.pm
78+
https://cdn.jsdelivr.net/hex
79+
- name: AUTHENTICATE TO GOOGLE CLOUD
80+
uses: google-github-actions/[email protected]
81+
with:
82+
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
7083
- name: BUILD SECONDARY UMBRELLA ARCHIVE
7184
if: env.exists != 'true'
7285
working-directory: secondary-umbrella
7386
run: |
74-
if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
87+
if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
7588
cat << EOF >> user.bazelrc
76-
build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
77-
EOF
78-
fi
79-
cat << EOF >> user.bazelrc
80-
build:buildbuddy --build_metadata=ROLE=CI
81-
build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
82-
build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-secondary-umbrella
83-
build:buildbuddy --color=yes
89+
build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
90+
build --google_default_credentials
8491
85-
build:buildbuddy --remote_download_toplevel
92+
build --remote_download_toplevel
8693
EOF
94+
fi
8795
8896
sed -i"_orig" -E "/APP_VERSION/ s/3\.[0-9]+\.[0-9]+/${{ steps.check.outputs.version }}/" rabbitmq.bzl
8997
bazelisk build :package-generic-unix \
90-
--config=rbe-${{ steps.check.outputs.otp_version_id }} \
9198
--test_build \
9299
--verbose_failures
93100
94101
OUTPUT_DIR=${{ github.workspace }}/output
95-
mkdir -p ${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}
102+
mkdir -p ${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}
96103
cp \
97104
bazel-bin/package-generic-unix.tar.xz \
98-
${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
105+
${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
99106
- name: UPLOAD THE ARCHIVE TO S3
100107
if: env.exists != 'true'
101108
uses: jakejarvis/[email protected]

‎.github/workflows/test-selenium.yaml

+15-7
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,32 @@ jobs:
4949
with:
5050
otp-version: ${{ matrix.erlang_version }}
5151
elixir-version: ${{ matrix.elixir_version }}
52+
hexpm-mirrors: |
53+
https://builds.hex.pm
54+
https://cdn.jsdelivr.net/hex
55+
56+
- name: Authenticate To Google Cloud
57+
uses: google-github-actions/[email protected]
58+
with:
59+
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
5260

5361
- name: Configure Bazel
5462
run: |
55-
if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
63+
if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
5664
cat << EOF >> user.bazelrc
57-
build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
65+
build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
66+
build --google_default_credentials
67+
68+
build --remote_download_toplevel
5869
EOF
5970
fi
6071
cat << EOF >> user.bazelrc
61-
build:buildbuddy --build_metadata=ROLE=CI
62-
build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
63-
build:buildbuddy --color=yes
72+
build --color=yes
6473
EOF
6574
6675
- name: Build & Load RabbitMQ OCI
6776
run: |
68-
bazelisk run packaging/docker-image:rabbitmq-amd64 \
69-
--config=buildbuddy
77+
bazelisk run packaging/docker-image:rabbitmq-amd64
7078
7179
- name: Configure Docker Network
7280
run: |

0 commit comments

Comments
 (0)