Skip to content

Commit

Permalink
Fix (and update) CI (#26)
Browse files Browse the repository at this point in the history
* Update GStreamer version used in Windows CI

* Change Windows GStreamer installation location to d:\

* Run Linux CI on ubuntu-24.04

* Fix linking to libm

This also requires calling `configure` without `-Werror` wich might be a
good idea anyway.

* Update checkout action

* Update setup-msbuild action

* Update upload-artifact action
  • Loading branch information
martinholters authored Jun 26, 2024
1 parent 0b9315e commit 700678d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
matrix:
cc: [ gcc, clang ]

runs-on: ubuntu-latest
runs-on: ubuntu-24.04

env:
CC: ${{ matrix.cc }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: install prerequisites
Expand All @@ -32,7 +32,7 @@ jobs:
- name: make distcheck
run: make distcheck
- if: ${{ matrix.cc == 'gcc' }}
uses: actions/upload-artifact@v2.2.1
uses: actions/upload-artifact@v4
with:
name: tarball
path: gstpeaq-*.tar.gz
Expand All @@ -47,38 +47,38 @@ jobs:
platform: win32
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install prerequisites
shell: cmd
run: |
curl --location https://gstreamer.freedesktop.org/data/pkg/windows/1.18.3/msvc/gstreamer-1.0-msvc-${{ matrix.arch }}-1.18.3.msi --output gstreamer.msi
curl --location https://gstreamer.freedesktop.org/data/pkg/windows/1.18.3/msvc/gstreamer-1.0-devel-msvc-${{ matrix.arch }}-1.18.3.msi --output gstreamer-devel.msi
curl --location https://gstreamer.freedesktop.org/data/pkg/windows/1.24.5/msvc/gstreamer-1.0-msvc-${{ matrix.arch }}-1.24.5.msi --output gstreamer.msi
curl --location https://gstreamer.freedesktop.org/data/pkg/windows/1.24.5/msvc/gstreamer-1.0-devel-msvc-${{ matrix.arch }}-1.24.5.msi --output gstreamer-devel.msi
msiexec /quiet /i gstreamer.msi
msiexec /quiet /i gstreamer-devel.msi
del gstreamer.msi
del gstreamer-devel.msi
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v2
- name: Build
env:
GSTREAMER_1_0_ROOT_MSVC_X86_64: c:\gstreamer\1.0\msvc_x86_64
GSTREAMER_1_0_ROOT_MSVC_X86: c:\gstreamer\1.0\msvc_x86
GSTREAMER_1_0_ROOT_MSVC_X86_64: d:\gstreamer\1.0\msvc_x86_64
GSTREAMER_1_0_ROOT_MSVC_X86: d:\gstreamer\1.0\msvc_x86
run: |
msbuild vs/gstpeaq.sln -property:Configuration=Release -property:Platform=${{ matrix.platform }}
msbuild vs/testpeaq.vcxproj -property:Configuration=Release -property:Platform=${{ matrix.platform }}
- name: Run tests
env:
GSTREAMER_1_0_ROOT_MSVC_X86_64: c:\gstreamer\1.0\msvc_x86_64
GSTREAMER_1_0_ROOT_MSVC_X86: c:\gstreamer\1.0\msvc_x86
GSTREAMER_1_0_ROOT_MSVC_X86_64: d:\gstreamer\1.0\msvc_x86_64
GSTREAMER_1_0_ROOT_MSVC_X86: d:\gstreamer\1.0\msvc_x86
shell: powershell
run: |
$Env:Path = "$Env:Path;c:\gstreamer\1.0\msvc_${{ matrix.arch }}\bin;"
$Env:Path = "$Env:Path;d:\gstreamer\1.0\msvc_${{ matrix.arch }}\bin;"
.\vs\${{ matrix.platform }}\Release\testpeaq
if ($LASTEXITCODE -ne 0) {
throw "test failure"
}
.\vs\runtest-${{ matrix.platform }}.ps1
- uses: actions/upload-artifact@v2.2.1
- uses: actions/upload-artifact@v4
with:
name: binaries-win-${{ matrix.arch }}
path: |
Expand Down
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ aclocal -I m4
autoheader
autoconf
automake --add-missing
CFLAGS="-Wall -Werror -g -DGST_DISABLE_DEPRECATED" ./configure --enable-gtk-doc --enable-man --prefix=/usr $@
CFLAGS="-Wall -g -DGST_DISABLE_DEPRECATED" ./configure --enable-gtk-doc --enable-man --prefix=/usr $@
2 changes: 2 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ AC_HEADER_STDC

AC_FUNC_MALLOC

AC_CHECK_LIB([m], [exp])

GST_API_VERSION=1.0
gstreamer_1_0_packages="gstreamer-1.0 gstreamer-base-1.0 gstreamer-fft-1.0"
PKG_CHECK_MODULES(PKGCONF, [$gstreamer_1_0_packages])
Expand Down

0 comments on commit 700678d

Please sign in to comment.