From 5d3620e88ea3403a8fc0d988fd2ae10b22e58a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=9Aled=C5=BA?= Date: Sat, 27 Jul 2024 11:41:52 +0200 Subject: [PATCH] WIP Run CI on more OSes and Archs --- .github/workflows/ci.yml | 25 ++++++++++++++++++++----- Makefile | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 161f7f5..d7e1fb0 100644 --- 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,8 +42,8 @@ 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: @@ -50,3 +51,17 @@ jobs: - 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 index 2f67ce8..4fdab8d 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ 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)