From 704c02b579822891ded0cb7b521ec6cd4a9e849e Mon Sep 17 00:00:00 2001
From: Saleem Rashid <dev@saleemrashid.com>
Date: Sun, 7 Feb 2021 22:13:44 +0000
Subject: [PATCH] Revert "Run tests on AArch64"

This reverts commit 0f8ceb68fd16e2b2a6c95a0e919dff4989cd0dec.
---
 .github/workflows/bindgen.yml | 23 -----------------------
 ci/test.sh                    | 16 +++-------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/bindgen.yml b/.github/workflows/bindgen.yml
index 0a340badcc..9aa090754b 100644
--- a/.github/workflows/bindgen.yml
+++ b/.github/workflows/bindgen.yml
@@ -149,29 +149,6 @@ jobs:
           BINDGEN_NO_DEFAULT_FEATURES: ${{matrix.no_default_features}}
         run: ./ci/test.sh
 
-  test_aarch64:
-    name: "Run tests on AArch64"
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: uraimo/run-on-arch-action@v2.0.8
-        name: Run test commands
-        with:
-          arch: aarch64
-          distro: ubuntu20.04
-          githubToken: ${{ github.token }}
-          env: |
-            LLVM_VERSION: "10.0"
-          dockerRunArgs: |
-            --volume "${HOME}/.cargo:/root/.cargo"
-          install: |
-            apt-get update -q -y
-            apt-get install -q -y curl gcc git g++ libtinfo5 xz-utils
-          run: |
-            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
-            source $HOME/.cargo/env
-            ./ci/test.sh
-
   test-book:
     runs-on: ubuntu-latest
     steps:
diff --git a/ci/test.sh b/ci/test.sh
index cc83475582..d5bb0bf40d 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -8,18 +8,8 @@ set -x
 # Give a pipeline a non-zero exit code if one of its constituents fails
 set -o pipefail
 
-# Set default values on environment variables
-BINDGEN_RELEASE_BUILD="${BINDGEN_RELEASE_BUILD:-0}"
-BINDGEN_FEATURE_RUNTIME="${BINDGEN_FEATURE_RUNTIME:-0}"
-BINDGEN_FEATURE_EXTRA_ASSERTS="${BINDGEN_FEATURE_EXTRA_ASSERTS:-0}"
-BINDGEN_FEATURE_TESTING_ONLY_DOCS="${BINDGEN_FEATURE_TESTING_ONLY_DOCS:-0}"
-BINDGEN_NO_DEFAULT_FEATURES="${BINDGEN_NO_DEFAULT_FEATURES:-0}"
-
 function llvm_linux_target_triple() {
-  case "$(uname -m)" in
-    aarch64) echo "aarch64-linux-gnu" ;;
-    *)       echo "x86_64-linux-gnu-ubuntu-16.04" ;;
-  esac
+  echo "x86_64-linux-gnu-ubuntu-16.04"
 }
 
 function llvm_macos_target_triple() {
@@ -62,7 +52,7 @@ function llvm_download() {
   if [ -d "${LLVM_DIRECTORY}" ]; then
     echo "Using cached LLVM download for ${LLVM}..."
   else
-    curl -L -o ${LLVM}.tar.xz $base_url/${LLVM}.tar.xz
+    wget --no-verbose $base_url/${LLVM}.tar.xz
     mkdir -p "${LLVM_DIRECTORY}"
     tar xf ${LLVM}.tar.xz -C "${LLVM_DIRECTORY}" --strip-components=1
   fi
@@ -76,7 +66,7 @@ set_llvm_env() {
   export LLVM_VERSION_TRIPLE=`llvm_version_triple ${LLVM_VERSION}`
   local base_url=`llvm_base_url ${LLVM_VERSION_TRIPLE}`
 
-  if [ "$(uname -s)" == "Linux" ]; then
+  if [ "$GITHUB_ACTIONS_OS" == "ubuntu-latest" ]; then
     llvm_download $base_url `llvm_linux_target_triple ${LLVM_VERSION_TRIPLE}`
     export LD_LIBRARY_PATH="${LLVM_DIRECTORY}/lib":${LD_LIBRARY_PATH:-}
   else