From 4f94d16724c3d00ecf91734a67c2e1fcb237a6cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Thu, 10 Oct 2024 10:46:31 +0000 Subject: [PATCH] [Imp] build: CI: GitHub: Add OpenBSD 7.6. git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@21794 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- .github/workflows/OpenBSD-Autotools.yml | 13 +++++++------ .github/workflows/OpenBSD-Makefile.yml | 17 ++++++++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/OpenBSD-Autotools.yml b/.github/workflows/OpenBSD-Autotools.yml index dbd31f827ca..848300df655 100644 --- a/.github/workflows/OpenBSD-Autotools.yml +++ b/.github/workflows/OpenBSD-Autotools.yml @@ -13,6 +13,7 @@ jobs: fail-fast: false matrix: include: + - { version: '7.6' } - { version: '7.5' } - { version: '7.4' } @@ -26,7 +27,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018 with: architecture: x86_64 memory: 4G @@ -37,7 +38,7 @@ jobs: shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018 with: architecture: x86_64 memory: 4G @@ -48,11 +49,11 @@ jobs: shutdown_vm: false run: | sudo pkg_add -u - sudo pkg_add -I ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }} - sudo pkg_add -I ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} + sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }} + sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018 with: architecture: x86_64 memory: 4G @@ -64,7 +65,7 @@ jobs: run: | export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018 with: architecture: x86_64 memory: 4G diff --git a/.github/workflows/OpenBSD-Makefile.yml b/.github/workflows/OpenBSD-Makefile.yml index 9d59e8ba849..0a07757447a 100644 --- a/.github/workflows/OpenBSD-Makefile.yml +++ b/.github/workflows/OpenBSD-Makefile.yml @@ -13,6 +13,9 @@ jobs: fail-fast: false matrix: include: + - { version: '7.6', deps: sys } + - { version: '7.6', deps: local } + - { version: '7.6', deps: small } - { version: '7.5', deps: sys } - { version: '7.5', deps: local } - { version: '7.5', deps: small } @@ -30,7 +33,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018 with: architecture: x86_64 memory: 4G @@ -41,7 +44,7 @@ jobs: shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018 with: architecture: x86_64 memory: 4G @@ -52,11 +55,11 @@ jobs: shutdown_vm: false run: | sudo pkg_add -u - sudo pkg_add -I ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }} - sudo pkg_add -I ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} + sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }} + sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018 with: architecture: x86_64 memory: 4G @@ -68,7 +71,7 @@ jobs: run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018 with: architecture: x86_64 memory: 4G @@ -80,7 +83,7 @@ jobs: run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018 with: architecture: x86_64 memory: 4G