Skip to content

Commit b830b91

Browse files
authored
Merge pull request #64 from AikidoSec/ffi-arm
Also run smoke test FFI on ubuntu ARM
2 parents 063454f + 23ba302 commit b830b91

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.github/workflows/smoke_test_ffi.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,28 @@ jobs:
99
ruby: [ "3.3" ]
1010
# macos-14 is ARM-based
1111
# macos-14-large is x86-based
12-
# Ubuntu is not included because the full test suite runs on Ubuntu
13-
os: [ macos-14, macos-14-large ]
12+
# ubuntu-latest (x86) is not included because the full test suite runs on it
13+
os: [ macos-14, macos-14-large, ubuntu-22.04-arm ]
1414

1515
runs-on: ${{ matrix.os }}
1616

1717
# Allows all jobs to run even if one fails
1818
continue-on-error: true
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222
- name: Set up the correct Gemfile for Ruby ${{ matrix.ruby }}
2323
run: bin/link_gemfile "${{ matrix.ruby }}"
2424
# Lock files are generated for a specific platform
2525
- run: rm Gemfile.lock
26-
- run: |
26+
- name: Install system dependencies
27+
if: runner.os == 'macOS'
28+
run: |
2729
brew install mysql postgresql
2830
bundle config set build.mysql2 --with-opt-dir=$(brew --prefix zstd)
31+
- name: Install system dependencies
32+
if: runner.os == 'Linux'
33+
run: "sudo apt-get install libmysqlclient-dev libpq-dev libcurl4-openssl-dev"
2934
- name: Set up Ruby
3035
uses: ruby/setup-ruby@v1
3136
with:

tasklib/libzen.rake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ LIBZENS = [
7676
LibZen.new("arm64-darwin.dylib", "libzen_internals_aarch64-apple-darwin.dylib"),
7777
LibZen.new("arm64-linux.so", "libzen_internals_aarch64-unknown-linux-gnu.so"),
7878
LibZen.new("arm64-linux-musl.so", "libzen_internals_aarch64-unknown-linux-musl.so"),
79+
LibZen.new("aarch64-linux.so", "libzen_internals_aarch64-unknown-linux-gnu.so"),
7980
LibZen.new("x86_64-darwin.dylib", "libzen_internals_x86_64-apple-darwin.dylib"),
8081
LibZen.new("x86_64-linux.so", "libzen_internals_x86_64-unknown-linux-gnu.so"),
8182
LibZen.new("x86_64-linux-musl.so", "libzen_internals_x86_64-unknown-linux-musl.so"),

0 commit comments

Comments
 (0)