From 57b67484e0efcbd2923caec9a1b4d319fc880947 Mon Sep 17 00:00:00 2001
From: Ryan Northey <ryan@synca.io>
Date: Sun, 4 Aug 2024 20:04:31 +0100
Subject: [PATCH 1/2] Revert "gh-actions/envoy/ci: Add arm64 support (#2137)"

This reverts commit 27c083bdb5bc272ac8a23ceea6719656b2db52ca.
---
 gh-actions/envoy/ci/request/action.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gh-actions/envoy/ci/request/action.yml b/gh-actions/envoy/ci/request/action.yml
index d48f926f17..3d0a526053 100644
--- a/gh-actions/envoy/ci/request/action.yml
+++ b/gh-actions/envoy/ci/request/action.yml
@@ -131,20 +131,16 @@ runs:
         | (.["build-image"].tag | validate::sha(40)) as $tag
         | (.["build-image"].sha | validate::sha(64)) as $sha
         | (.["build-image"]["mobile-sha"] | validate::sha(64)) as $mobileSha
-        | (.["build-image"]["arm64-sha"] | validate::sha(64)) as $arm64Sha
         | {"default": "\($repo):\($tag)@sha256:\($sha)",
-           "mobile": "\($repo):mobile-\($tag)@sha256:\($mobileSha)",
-           "arm64": "\($repo):arm64-\($tag)@sha256:\($arm64Sha)"}
+           "mobile": "\($repo):mobile-\($tag)@sha256:\($mobileSha)"}
         | . as $requested
         | ${{ steps.config.outputs.output }}
         | .["build-image"].repo as $repo
         | .["build-image"].tag as $tag
         | .["build-image"].sha as $sha
         | .["build-image"]["mobile-sha"] as $mobileSha
-        | .["build-image"]["arm64-sha"] as $arm64Sha
         | {default: "\($repo):\($tag)@sha256:\($sha)",
-           mobile: "\($repo)::mobile-\($tag)@sha256:\($mobileSha)",
-           arm64: "\($repo)::arm64-\($tag)@sha256:\($arm64Sha)"}
+           mobile: "\($repo)::mobile-\($tag)@sha256:\($mobileSha)"}
         | {$requested, current: .}
 
   # Check current/request versions

From e1cea648e847fa3f1d974ed97d53fc3e780163c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Oct 2024 23:26:14 +0000
Subject: [PATCH 2/2] build(deps): bump actions/setup-java in
 /gh-actions/envoy/android/pre

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.1 to 4.5.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/99b8673ff64fbf99d8d325f52d9a5bdedb8483e9...8df1039502a15bceb9433410b1a100fbe190c53b)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gh-actions/envoy/android/pre/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gh-actions/envoy/android/pre/action.yml b/gh-actions/envoy/android/pre/action.yml
index 4ebdcd573d..e09bf707bb 100644
--- a/gh-actions/envoy/android/pre/action.yml
+++ b/gh-actions/envoy/android/pre/action.yml
@@ -1,7 +1,7 @@
 runs:
   using: composite
   steps:
-  - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
+  - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
     with:
       java-version: '11'
       java-package: jdk