Author: manx
Date: Sun Jun 16 19:04:55 2024
New Revision: 21038
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21038
Log:
Merged revision(s) 21037 from trunk/OpenMPT:
[Mod] build: CI: GitHub: Update FreeBSD to 14.1.
[Mod] build: CI: GitHub: Update FreeBSD CPA to commit 6acac3ca1b632aa762721d537dea32398ba0f2b1.
........
Modified:
branches/OpenMPT-1.31/ (props changed)
branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml
branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml
Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml Sun Jun 16 19:04:21 2024 (r21037)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml Sun Jun 16 19:04:55 2024 (r21038)
@@ -11,7 +11,7 @@
fail-fast: false
matrix:
include:
- - { version: '14.0' }
+ - { version: '14.1' }
- { version: '13.3' }
concurrency:
@@ -24,7 +24,7 @@
- name: Checkout
uses: actions/checkout@v4
- name: Startup VM
- uses: cross-platform-actions/action@v0.24.0
+ uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
with:
architecture: x86_64
hypervisor: qemu
@@ -36,7 +36,7 @@
shutdown_vm: false
run: true
- name: Install dependencies
- uses: cross-platform-actions/action@v0.24.0
+ uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
with:
architecture: x86_64
hypervisor: qemu
@@ -49,7 +49,7 @@
run: |
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.24.0
+ uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
with:
architecture: x86_64
hypervisor: qemu
@@ -62,7 +62,7 @@
run: |
export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh
- name: Shutdown VM
- uses: cross-platform-actions/action@v0.24.0
+ uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
with:
architecture: x86_64
hypervisor: qemu
Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Sun Jun 16 19:04:21 2024 (r21037)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Sun Jun 16 19:04:55 2024 (r21038)
@@ -11,9 +11,9 @@
fail-fast: false
matrix:
include:
- - { version: '14.0', deps: sys }
- - { version: '14.0', deps: local }
- - { version: '14.0', deps: small }
+ - { 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 }
@@ -28,7 +28,7 @@
- name: Checkout
uses: actions/checkout@v4
- name: Startup VM
- uses: cross-platform-actions/action@v0.24.0
+ uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
with:
architecture: x86_64
hypervisor: qemu
@@ -40,7 +40,7 @@
shutdown_vm: false
run: true
- name: Install dependencies
- uses: cross-platform-actions/action@v0.24.0
+ uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
with:
architecture: x86_64
hypervisor: qemu
@@ -53,7 +53,7 @@
run: |
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.24.0
+ uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
with:
architecture: x86_64
hypervisor: qemu
@@ -66,7 +66,7 @@
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_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.24.0
+ uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
with:
architecture: x86_64
hypervisor: qemu
@@ -79,7 +79,7 @@
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_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.24.0
+ uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
with:
architecture: x86_64
hypervisor: qemu
|
