Skip to content

Commit

Permalink
CI fix attempt 1: install openssl
Browse files Browse the repository at this point in the history
  • Loading branch information
samansmink committed May 14, 2024
1 parent cd5277b commit 3f50582
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions .github/workflows/_extension_distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ jobs:
- name: Setup Ccache
uses: hendrikmuhs/[email protected] # Note: pinned due to GLIBC incompatibility in later releases
continue-on-error: true
with:
key: ${{ github.job }}-${{ matrix.duckdb_arch }}

Expand All @@ -165,6 +166,17 @@ jobs:
with:
vcpkgGitCommitId: ${{ inputs.vcpkg_commit }}

- name: Handle OpenSSL dependency for rust build
run: |
${{ github.workspace }}/vcpkg/vcpkg install openssl
echo "OPENSSL_ROOT_DIR=${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkg_triplet }}" >> $GITHUB_ENV
echo "OPENSSL_USE_STATIC_LIBS=true" >> $GITHUB_ENV
- name: Set Openssl dir
if: inputs.openssl_path != ''
shell: bash
run: |
- name: Build extension
env:
GEN: ninja
Expand Down Expand Up @@ -219,6 +231,7 @@ jobs:
- name: Setup Ccache
uses: hendrikmuhs/ccache-action@main
continue-on-error: true
with:
key: ${{ github.job }}-${{ matrix.duckdb_arch }}

Expand All @@ -237,9 +250,9 @@ jobs:
vcpkgGitCommitId: ${{ inputs.vcpkg_commit }}

- name: Install Rust cross compile dependency
if: ${{ matrix.osx_build_arch == 'arm64'}}
if: ${{ matrix.osx_build_arch == 'x86_64'}}
run: |
rustup target add aarch64-apple-darwin
rustup target add x86_64-apple-darwin
- name: Build extension
shell: bash
Expand All @@ -249,7 +262,7 @@ jobs:
make release
- name: Test Extension
if: ${{ matrix.osx_build_arch == 'x86_64'}}
if: ${{ matrix.osx_build_arch == 'arm64'}}
shell: bash
run: |
make test
Expand Down Expand Up @@ -312,6 +325,7 @@ jobs:
- name: Setup Ccache
uses: hendrikmuhs/ccache-action@main
continue-on-error: true
with:
key: ${{ github.job }}-${{ matrix.duckdb_arch }}

Expand Down Expand Up @@ -378,6 +392,7 @@ jobs:

- name: Setup Ccache
uses: hendrikmuhs/ccache-action@main
continue-on-error: true
with:
key: ${{ github.job }}-${{ matrix.duckdb_arch }}

Expand Down

0 comments on commit 3f50582

Please sign in to comment.