From 8d2a24c060d017b784525a3ba386af15f6a9aaa2 Mon Sep 17 00:00:00 2001
From: agibsonccc <adam@konduit.ai>
Date: Wed, 10 Mar 2021 18:16:40 +0900
Subject: [PATCH] Update

---
 .github/workflows/build-android-x86_64.yml | 6 ++++--
 .github/workflows/test_multiple_arch.yaml  | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-android-x86_64.yml b/.github/workflows/build-android-x86_64.yml
index 82ce71160..682104766 100644
--- a/.github/workflows/build-android-x86_64.yml
+++ b/.github/workflows/build-android-x86_64.yml
@@ -32,12 +32,12 @@ jobs:
       - name: Build on linux-x86_64
         env:
           ANDROID_NDK: ${{ steps.setup-ndk.outputs.ndk-path }}
-          LIBND4J_HOME: "${GITHUB_WORKSPACE}/libnd4j"
+          LIBND4J_HOME: ${GITHUB_WORKSPACE}/libnd4j
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MAVEN_USERNAME: ${{ secrets.SONATYPE_USER_1 }}
           MAVEN_PASSWORD: ${{ secrets.SONATYPE_USER1_PASS }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.PACKAGES_GPG_PASS }}
-          OPENBLAS_PATH: "$HOME/.javacpp/cache/openblas-0.3.13-1.5.5-android-x86_64.jar/lib/"
+          OPENBLAS_PATH: ${HOME}/.javacpp/cache/openblas-0.3.13-1.5.5-android-x86_64.jar/lib/
           DEPLOY_TO: ossrh
         run: |
           echo "Verifying programs on path. Path is $PATH"
@@ -46,6 +46,8 @@ jobs:
           cmake --version
           protoc --version
           clang --version
+          export LIBND4J_HOME=${GITHUB_WORKSPACE}/libnd4j
+          export OPENBLAS_PATH=${HOME}/.javacpp/cache/openblas-0.3.13-1.5.5-android-x86_64.jar/lib/
           mvn  -X -Dorg.bytedeco.javacpp.logger.debug=true -Possrh -pl ":nd4j-native,:libnd4j" --also-make  \
           -Djavacpp.platform=android-x86_64  \
           -Dlibnd4j.platform=android-x86_64 -Dlibnd4j.chip=cpu \
diff --git a/.github/workflows/test_multiple_arch.yaml b/.github/workflows/test_multiple_arch.yaml
index f20758e6b..bee31b573 100644
--- a/.github/workflows/test_multiple_arch.yaml
+++ b/.github/workflows/test_multiple_arch.yaml
@@ -37,8 +37,10 @@ jobs:
           shell: /bin/sh
           run: |
                echo "Running install on architecture ${{ matrix.arch }}"
-               apt-get -yq  update && apt-get install -y build-essential unzip libssl-dev
+               apt-get -yq  update && apt-get install -y build-essential unzip libssl-dev curl
                echo "After install on architecture ${{ matrix.arch }}"
+               mkdir -p "/opt/maven"
+               curl -fsSL http://apache.osuosl.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | tar -xzC "/opt/maven" --strip-components=1
                export PATH="/opt/maven/bin:$PATH"
                    echo "RUNNING ARCH ${{ matrix.arch }}"
                             case "${{ matrix.arch }}" in