Don't force x64 arch

AuraDevelopmentTeam · Sep 21, 2024 · 41708c2 · 41708c2
1 parent 3bff2d3
commit 41708c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
@@ -28,7 +28,6 @@ jobs:
         with:
           java-version: 11
           java-package: jdk
-          architecture: x64
           distribution: 'temurin'
       - name: Checkout submodules
         run: git submodule update --init --recursive
@@ -48,7 +47,6 @@ jobs:
         with:
           java-version: 11
           java-package: jdk
-          architecture: x64
           distribution: 'temurin'
       - name: Checkout submodules
         run: git submodule update --init --recursive
@@ -86,19 +84,16 @@ jobs:
         with:
           java-version: 11
           java-package: jdk
-          architecture: x64
           distribution: 'temurin'
       - name: Checkout submodules
         run: git submodule update --init --recursive
       # This is to ensure unit tests with MariaDB4j don't fail
-      - name: Install OpenSSL 1.0.2
+      - name: Pretent we OpenSSL 1.0
         if: ${{ runner.os == 'MacOS' }}
         run: |
-          arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
-          eval "$(/usr/local/bin/brew shellenv)"
-          arch -x86_64 brew install rbenv/tap/openssl@1.0
-          sudo ln -sfnv /usr/local/Cellar/openssl@1.0/1.0.2* /usr/local/opt/openssl
-          stat /usr/local/opt/openssl/lib/libssl.1.0.0.dylib
+          sudo mkdir -pv /usr/local/opt/openssl/lib
+          sudo ln -sv /usr/lib/libssl.dylib /usr/local/opt/openssl/lib/libssl.1.0.0.dylib
+          sudo ln -sv /usr/lib/libcrypto.dylib /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib
       # This is to ensure unit tests with MariaDB4j don't fail
       - name: Install libncurses5
         if: ${{ runner.os == 'Linux' }}

diff --git a/.github/workflows/lang_checks.yml b/.github/workflows/lang_checks.yml
@@ -35,7 +35,6 @@ jobs:
         with:
           java-version: 11
           java-package: jdk
-          architecture: x64
           distribution: 'temurin'
       - name: Checkout submodules
         run: git submodule update --init --recursive