From 4e6c42d0cbee9f895b043d796a3fee44929234bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Sun, 22 Sep 2024 06:56:06 +0000 Subject: [PATCH] Merged revision(s) 21657 from trunk/OpenMPT: [Imp] build: CI: GitHub: CPA: FreeBSD:Update FreeBSD 13 to 13.4. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@21658 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- .github/workflows/FreeBSD-Autotools.yml | 10 +++++----- .github/workflows/FreeBSD-Makefile.yml | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/FreeBSD-Autotools.yml b/.github/workflows/FreeBSD-Autotools.yml index 92b6b2d833..c1c659a950 100644 --- a/.github/workflows/FreeBSD-Autotools.yml +++ b/.github/workflows/FreeBSD-Autotools.yml @@ -12,7 +12,7 @@ jobs: matrix: include: - { version: '14.1' } - - { version: '13.3' } + - { version: '13.4' } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools @@ -24,7 +24,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@c306e1ae6fbb31dd74f8e0d052794224b92fec42 with: architecture: x86_64 memory: 4G @@ -35,7 +35,7 @@ jobs: shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@c306e1ae6fbb31dd74f8e0d052794224b92fec42 with: architecture: x86_64 memory: 4G @@ -48,7 +48,7 @@ jobs: sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@c306e1ae6fbb31dd74f8e0d052794224b92fec42 with: architecture: x86_64 memory: 4G @@ -60,7 +60,7 @@ jobs: run: | export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@c306e1ae6fbb31dd74f8e0d052794224b92fec42 with: architecture: x86_64 memory: 4G diff --git a/.github/workflows/FreeBSD-Makefile.yml b/.github/workflows/FreeBSD-Makefile.yml index 1d72538829..b15539bec0 100644 --- a/.github/workflows/FreeBSD-Makefile.yml +++ b/.github/workflows/FreeBSD-Makefile.yml @@ -14,9 +14,9 @@ jobs: - { version: '14.1', deps: sys } - { version: '14.1', deps: local } - { version: '14.1', deps: small } - - { version: '13.3', deps: sys } - - { version: '13.3', deps: local } - - { version: '13.3', deps: small } + - { version: '13.4', deps: sys } + - { version: '13.4', deps: local } + - { version: '13.4', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} @@ -28,7 +28,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@c306e1ae6fbb31dd74f8e0d052794224b92fec42 with: architecture: x86_64 memory: 4G @@ -39,7 +39,7 @@ jobs: shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@c306e1ae6fbb31dd74f8e0d052794224b92fec42 with: architecture: x86_64 memory: 4G @@ -52,7 +52,7 @@ jobs: sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@c306e1ae6fbb31dd74f8e0d052794224b92fec42 with: architecture: x86_64 memory: 4G @@ -64,7 +64,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@c306e1ae6fbb31dd74f8e0d052794224b92fec42 with: architecture: x86_64 memory: 4G @@ -76,7 +76,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@c306e1ae6fbb31dd74f8e0d052794224b92fec42 with: architecture: x86_64 memory: 4G