Merge branch 'v3.12.x' into mergify/bp/v3.12.x/pr-11485

rabbitmq · Jun 20, 2024 · b7673a7 · b7673a7
2 parents db459f0 + f7da6c0
commit b7673a7
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 212 deletions.
diff --git a/.github/workflows/perform-bazel-execution-comparison.yaml b/.github/workflows/perform-bazel-execution-comparison.yaml
diff --git a/.github/workflows/templates/test-mixed-versions.template.yaml b/.github/workflows/templates/test-mixed-versions.template.yaml
@@ -76,9 +76,9 @@ jobs:
         fi
         echo "exists=${exists}" | tee $GITHUB_ENV
 
-        OTP_VERSION_ID=${ARCHIVE_URL#*secondary-umbrellas/rbe-}
-        OTP_VERSION_ID=${OTP_VERSION_ID%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz}
-        echo "otp_version_id=${OTP_VERSION_ID}" | tee -a $GITHUB_OUTPUT
+        OTP_VERSION=${ARCHIVE_URL#*secondary-umbrellas/}
+        OTP_VERSION=${OTP_VERSION%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz}
+        echo "otp_version=${OTP_VERSION}" | tee -a $GITHUB_OUTPUT
 
         VERSION=${ARCHIVE_URL#*package-generic-unix-for-mixed-version-testing-v}
         VERSION=${VERSION%*.tar.xz}
@@ -89,35 +89,42 @@ jobs:
       with:
         ref: v${{ steps.check.outputs.version }}
         path: secondary-umbrella
+    - name: CONFIGURE OTP & ELIXIR
+      if: env.exists != 'true'
+      uses: erlef/setup-beam@v1.17
+      with:
+        otp-version: ${{ steps.check.outputs.otp_version }}
+        elixir-version: 1.14
+        hexpm-mirrors: |
+          https://builds.hex.pm
+          https://cdn.jsdelivr.net/hex
+    - name: AUTHENTICATE TO GOOGLE CLOUD
+      uses: google-github-actions/auth@v2.1.3
+      with:
+        credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
     - name: BUILD SECONDARY UMBRELLA ARCHIVE
       if: env.exists != 'true'
       working-directory: secondary-umbrella
       run: |
-        if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
+        if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
         cat << EOF >> user.bazelrc
-          build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
-        EOF
-        fi
-        cat << EOF >> user.bazelrc
-          build:buildbuddy --build_metadata=ROLE=CI
-          build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
-          build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-secondary-umbrella
-          build:buildbuddy --color=yes
+          build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
+          build --google_default_credentials
 
-          build:buildbuddy --remote_download_toplevel
+          build --remote_download_toplevel
         EOF
+        fi
 
         sed -i"_orig" -E "/APP_VERSION/ s/3\.[0-9]+\.[0-9]+/${{ steps.check.outputs.version }}/" rabbitmq.bzl
         bazelisk build :package-generic-unix \
-          --config=rbe-${{ steps.check.outputs.otp_version_id }} \
           --test_build \
           --verbose_failures
 
         OUTPUT_DIR=${{ github.workspace }}/output
-        mkdir -p ${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}
+        mkdir -p ${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}
         cp \
           bazel-bin/package-generic-unix.tar.xz \
-          ${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
+          ${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
     - name: UPLOAD THE ARCHIVE TO S3
       if: env.exists != 'true'
       uses: jakejarvis/s3-sync-action@v0.5.1

diff --git a/.github/workflows/test-authnz.yaml b/.github/workflows/test-authnz.yaml
@@ -52,24 +52,32 @@ jobs:
       with:
         otp-version: ${{ matrix.erlang_version }}
         elixir-version: ${{ matrix.elixir_version }}
+        hexpm-mirrors: |
+          https://builds.hex.pm
+          https://cdn.jsdelivr.net/hex
+
+    - name: Authenticate To Google Cloud
+      uses: google-github-actions/auth@v2.1.3
+      with:
+        credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
 
     - name: Configure Bazel
       run: |
-        if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
+        if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
         cat << EOF >> user.bazelrc
-          build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
+          build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
+          build --google_default_credentials
+
+          build --remote_download_toplevel
         EOF
         fi
         cat << EOF >> user.bazelrc
-          build:buildbuddy --build_metadata=ROLE=CI
-          build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
-          build:buildbuddy --color=yes
+          build --color=yes
         EOF
 
     - name: Build & Load RabbitMQ OCI
       run: |
-        bazelisk run packaging/docker-image:rabbitmq-amd64 \
-          --config=buildbuddy
+        bazelisk run packaging/docker-image:rabbitmq-amd64
 
     - name: Configure Docker Network
       run: |

diff --git a/.github/workflows/test-erlang-git.yaml b/.github/workflows/test-erlang-git.yaml
diff --git a/.github/workflows/test-mixed-versions.yaml b/.github/workflows/test-mixed-versions.yaml
@@ -54,9 +54,9 @@ jobs:
         fi
         echo "exists=${exists}" | tee $GITHUB_ENV
 
-        OTP_VERSION_ID=${ARCHIVE_URL#*secondary-umbrellas/rbe-}
-        OTP_VERSION_ID=${OTP_VERSION_ID%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz}
-        echo "otp_version_id=${OTP_VERSION_ID}" | tee -a $GITHUB_OUTPUT
+        OTP_VERSION=${ARCHIVE_URL#*secondary-umbrellas/}
+        OTP_VERSION=${OTP_VERSION%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz}
+        echo "otp_version=${OTP_VERSION}" | tee -a $GITHUB_OUTPUT
 
         VERSION=${ARCHIVE_URL#*package-generic-unix-for-mixed-version-testing-v}
         VERSION=${VERSION%*.tar.xz}
@@ -67,35 +67,42 @@ jobs:
       with:
         ref: v${{ steps.check.outputs.version }}
         path: secondary-umbrella
+    - name: CONFIGURE OTP & ELIXIR
+      if: env.exists != 'true'
+      uses: erlef/setup-beam@v1.17
+      with:
+        otp-version: ${{ steps.check.outputs.otp_version }}
+        elixir-version: 1.14
+        hexpm-mirrors: |
+          https://builds.hex.pm
+          https://cdn.jsdelivr.net/hex
+    - name: AUTHENTICATE TO GOOGLE CLOUD
+      uses: google-github-actions/auth@v2.1.3
+      with:
+        credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
     - name: BUILD SECONDARY UMBRELLA ARCHIVE
       if: env.exists != 'true'
       working-directory: secondary-umbrella
       run: |
-        if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
+        if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
         cat << EOF >> user.bazelrc
-          build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
-        EOF
-        fi
-        cat << EOF >> user.bazelrc
-          build:buildbuddy --build_metadata=ROLE=CI
-          build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
-          build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-secondary-umbrella
-          build:buildbuddy --color=yes
+          build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
+          build --google_default_credentials
 
-          build:buildbuddy --remote_download_toplevel
+          build --remote_download_toplevel
         EOF
+        fi
 
         sed -i"_orig" -E "/APP_VERSION/ s/3\.[0-9]+\.[0-9]+/${{ steps.check.outputs.version }}/" rabbitmq.bzl
         bazelisk build :package-generic-unix \
-          --config=rbe-${{ steps.check.outputs.otp_version_id }} \
           --test_build \
           --verbose_failures
 
         OUTPUT_DIR=${{ github.workspace }}/output
-        mkdir -p ${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}
+        mkdir -p ${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}
         cp \
           bazel-bin/package-generic-unix.tar.xz \
-          ${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
+          ${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
     - name: UPLOAD THE ARCHIVE TO S3
       if: env.exists != 'true'
       uses: jakejarvis/s3-sync-action@v0.5.1

diff --git a/.github/workflows/test-selenium.yaml b/.github/workflows/test-selenium.yaml
@@ -49,24 +49,32 @@ jobs:
       with:
         otp-version: ${{ matrix.erlang_version }}
         elixir-version: ${{ matrix.elixir_version }}
+        hexpm-mirrors: |
+          https://builds.hex.pm
+          https://cdn.jsdelivr.net/hex
+
+    - name: Authenticate To Google Cloud
+      uses: google-github-actions/auth@v2.1.3
+      with:
+        credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
 
     - name: Configure Bazel
       run: |
-        if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
+        if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
         cat << EOF >> user.bazelrc
-          build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
+          build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
+          build --google_default_credentials
+
+          build --remote_download_toplevel
         EOF
         fi
         cat << EOF >> user.bazelrc
-          build:buildbuddy --build_metadata=ROLE=CI
-          build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
-          build:buildbuddy --color=yes
+          build --color=yes
         EOF
 
     - name: Build & Load RabbitMQ OCI
       run: |
-        bazelisk run packaging/docker-image:rabbitmq-amd64 \
-          --config=buildbuddy
+        bazelisk run packaging/docker-image:rabbitmq-amd64
 
     - name: Configure Docker Network
       run: |