WIP Run CI on more OSes and Archs

elixir-webrtc · Jul 27, 2024 · 985c5db · 985c5db
1 parent f7b99ff
commit 985c5db
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on: push
 jobs:
   lint:
     runs-on: ubuntu-latest
-    name: lint OTP ${{matrix.otp}} / Elixir ${{matrix.elixir}}
+    name: lint / ubuntu-latest / OTP ${{matrix.otp}} / Elixir ${{matrix.elixir}}
     strategy:
       matrix:
         otp: ['25']
@@ -22,12 +22,13 @@ jobs:
       - run: mix docs 2>&1 | (! grep -q "warning:")
 
   test-linux:
-    runs-on: ubuntu-latest
-    name: test-linux-x86-64 OTP ${{matrix.otp}} / Elixir ${{matrix.elixir}}
     strategy:
       matrix:
+        os: ['ubuntu-24.04', 'ubuntu-22.04']
         otp: ['25']
         elixir: ['1.14']
+    runs-on: ${{ matrix.os }}
+    name: test-linux-x86-64 / ${{ matrix.os }} / OTP ${{matrix.otp}} / Elixir ${{matrix.elixir}}
     env:
       MIX_ENV: test
     steps:
@@ -41,12 +42,26 @@ jobs:
       - run: mix test
 
   test-macos:
-    runs-on: macos-latest
-    name: test-macos-x86-64 OTP latest / Elixir latest
+    runs-on: macos-13
+    name: test-macos-x86-64 / macos-13 / OTP latest / Elixir latest
     env:
       MIX_ENV: test
     steps:
       - uses: actions/checkout@v2
       - run: brew install ffmpeg elixir
       - run: mix deps.get
       - run: mix test
+
+  test-macos-arm:
+    runs-on: macos-14
+    name: test-macos-arm / macos-14 / OTP latest / Elixir latest
+    env:
+      MIX_ENV: test
+    steps:
+      - uses: actions/checkout@v2
+      - run: brew install ffmpeg elixir
+      - run: mix deps.get
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
+      - run: mix test
+
diff --git a/Makefile b/Makefile
@@ -17,10 +17,11 @@ CFLAGS = -fPIC -I$(ERTS_INCLUDE_DIR) -I${XAV_DIR} -shared $(XAV_DEBUG_LOGS)
 LDFLAGS = -lavcodec -lswscale -lavutil -lavformat -lavdevice -lswresample
 
 ifeq ($(shell uname -s),Darwin)
-	CFLAGS += -undefined dynamic_lookup
+	CFLAGS += -undefined dynamic_lookup $$(pkg-config --cflags --libs-only-L libavcodec libswscale libavutil libavformat libavdevice libswresample)
 endif
 
 $(XAV_SO): Makefile $(SOURCES) $(HEADERS)
+	uname --machine
 	mkdir -p $(PRIV_DIR)
 	$(CC) $(CFLAGS) $(SOURCES) -o $(XAV_SO) $(LDFLAGS)