From 397ce090e33f27d46b1151d8d4c8a0d0b61716f8 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 8 Jun 2022 12:36:12 -0700 Subject: [PATCH] wip --- .github/workflows/build.yml | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 80aaca0f4..a77fca621 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,15 +35,7 @@ jobs: - name: Brew Bundle run: | - brew update --preinstall - brew bundle --no-upgrade - - - name: Set OpenSSL Path Vars - run: | - export PATH="/usr/local/opt/openssl@3/bin:$PATH" - export LDFLAGS="-L/usr/local/opt/openssl@3/lib" - export CPPFLAGS="-I/usr/local/opt/openssl@3/include" - export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig" + brew bundle - name: Git Submodule run: | @@ -73,6 +65,10 @@ jobs: - name: Cargo Build if: steps.artifact_cache.outputs.cache-hit != 'true' run: | + export PATH="/usr/local/opt/openssl@3/bin:$PATH" + export LDFLAGS="-L/usr/local/opt/openssl@3/lib" + export CPPFLAGS="-I/usr/local/opt/openssl@3/include" + export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig" cargo build --release - name: Copy binaries to cache folder @@ -129,15 +125,7 @@ jobs: - name: Brew Bundle run: | - brew update --preinstall - brew bundle --no-upgrade - - - name: Set OpenSSL Path Vars - run: | - export PATH="/opt/homebrew/opt/openssl@3/bin:$PATH" - export LDFLAGS="-L/opt/homebrew/opt/openssl@3/lib" - export CPPFLAGS="-I/opt/homebrew/opt/openssl@3/include" - export PKG_CONFIG_PATH="/opt/homebrew/opt/openssl@3/lib/pkgconfig" + brew bundle - name: Git Submodule run: | @@ -167,6 +155,10 @@ jobs: - name: Cargo Build if: steps.artifact_cache.outputs.cache-hit != 'true' run: | + export PATH="/opt/homebrew/opt/openssl@3/bin:$PATH" + export LDFLAGS="-L/opt/homebrew/opt/openssl@3/lib" + export CPPFLAGS="-I/opt/homebrew/opt/openssl@3/include" + export PKG_CONFIG_PATH="/opt/homebrew/opt/openssl@3/lib/pkgconfig" cargo build --release - name: Copy binaries to cache folder