Skip to content

Commit 21f35e4

Browse files
committed
Remove the obsolete macos-11 CI build & add a Debian testing one
The macOS 11 machines were removed recently. Debian testing is a rolling release and so it allows quicker testing with recent versions of dependencies.
1 parent d4a1bca commit 21f35e4

File tree

1 file changed

+13
-68
lines changed

1 file changed

+13
-68
lines changed

.github/workflows/ci.yml

+13-68
Original file line numberDiff line numberDiff line change
@@ -534,71 +534,6 @@ jobs:
534534
- name: install test
535535
run: make prefix= DESTDIR="${PWD}" -j 1 ${{ matrix.build.install_target }}
536536

537-
build-osx11:
538-
runs-on: macos-11
539-
env:
540-
MAKEFLAGS: -j 3
541-
strategy:
542-
fail-fast: false
543-
matrix:
544-
build:
545-
- cc: gcc
546-
gtk: 2
547-
install: desktop-file-utils docbook-xsl exiv2 gtk+
548-
cflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1
549-
cxxflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1 -std=c++11
550-
ldflags: -O3 -lintl
551-
cxx: g++
552-
target: all
553-
install_target: install install-po install-desktop-file
554-
- cc: gcc
555-
gtk: 3
556-
install: desktop-file-utils docbook-xsl exiv2 gtk+3
557-
cflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1
558-
cxxflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1 -std=c++11
559-
ldflags: -O3 -lintl
560-
cxx: g++
561-
target: all
562-
install_target: install install-po install-desktop-file
563-
- cc: clang
564-
gtk: 2
565-
install: desktop-file-utils docbook-xsl exiv2 gtk+
566-
cflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1
567-
cxxflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1 -std=c++11
568-
ldflags: -O3 -lintl
569-
cxx: clang++
570-
target: all
571-
install_target: install install-po install-desktop-file
572-
- cc: clang
573-
gtk: 3
574-
install: desktop-file-utils docbook-xsl exiv2 gtk+3
575-
cflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1
576-
cxxflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1 -std=c++11
577-
ldflags: -O3 -lintl
578-
cxx: clang++
579-
target: all
580-
install_target: install install-po install-desktop-file
581-
582-
steps:
583-
- uses: actions/checkout@v4
584-
- name: install deps
585-
run: brew install ${{ matrix.build.install }}
586-
- name: build
587-
run: make CFLAGS="${{ matrix.build.cflags }}" CXXFLAGS="${{ matrix.build.cxxflags }}" LDFLAGS="${{ matrix.build.ldflags }}" CC="${{ matrix.build.cc }}" CXX="${{ matrix.build.cxx }}" GTK="${{ matrix.build.gtk }}" ${{ matrix.build.make_opts }} XML_CATALOG_FILES="$(brew --prefix)/etc/xml/catalog" XSLTFLAGS=--nonet ${{ matrix.build.target }}
588-
- name: smoke test
589-
run: ./gpscorrelate -V
590-
- name: test
591-
run: |
592-
if [[ -z "${{ matrix.build.failing_tests }}" ]] ; then
593-
make check CHECK_OPTIONS=-v ASAN_OPTIONS="${{ matrix.build.asan_options }}"
594-
else
595-
# Debug logging enabled makes some tests fail due to differing output
596-
echo 'Expecting ${{ matrix.build.failing_tests }} test failures'
597-
make check CHECK_OPTIONS=-v | tee /dev/stderr | grep -q '${{ matrix.build.failing_tests }} test(s) have FAILED'
598-
fi
599-
- name: install test
600-
run: make prefix= DESTDIR="${PWD}" -j 1 ${{ matrix.build.install_target }}
601-
602537
build-fedora39:
603538
runs-on: ubuntu-latest
604539
container: fedora:39
@@ -673,9 +608,8 @@ jobs:
673608
- name: install test
674609
run: make prefix= DESTDIR="${PWD}" ${{ matrix.build.install_target }}
675610

676-
build-debian-bookworm:
611+
build-debian:
677612
runs-on: ubuntu-latest
678-
container: debian:bookworm-slim
679613
strategy:
680614
fail-fast: false
681615
matrix:
@@ -687,7 +621,18 @@ jobs:
687621
cflags: -m32 -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1
688622
target: gpscorrelate gpscorrelate-gui
689623
arch: i386
690-
624+
# Debian stable
625+
container: debian:bookworm-slim
626+
- name: 'x86_64 testing'
627+
cc: gcc
628+
cxx: g++
629+
install: make gcc g++ exiv2 libexiv2-dev libgtk-3-dev gettext libxml2-dev
630+
cflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1
631+
target: gpscorrelate gpscorrelate-gui
632+
arch: amd64
633+
# Debian testing
634+
container: debian:testing
635+
container: ${{ matrix.build.container }}
691636
steps:
692637
- uses: actions/checkout@v4
693638
- name: 'install deps'

0 commit comments

Comments
 (0)