Skip to content

Commit 1267368

Browse files
manxoristmanxorist
committed
Merged revision(s) 25354 from branches/OpenMPT-1.31:
Merged revision(s) 25353 from branches/OpenMPT-1.32: Merged revision(s) 25350-25352 from trunk/OpenMPT: [Var] build: CI: GitHub: CPA: Update to v1.1.0 (2026-05-17). ........ [Var] build: CI: GitHub: CPA: Update to v1.2.0 (2026-05-30). ........ [Imp] build: CI: GitHub: CPA: Add OpenBSD 7.9. ........ ........ ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@25355 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent 9fbcba1 commit 1267368

2 files changed

Lines changed: 35 additions & 100 deletions

File tree

‎.github/workflows/FreeBSD-Makefile.yml‎

Lines changed: 15 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -28,61 +28,27 @@ jobs:
2828
- name: Checkout
2929
uses: actions/checkout@v4
3030
- name: Startup VM
31-
uses: cross-platform-actions/action@bf4c487506d60be13c9e4d72c1f430e2361efebf
32-
with:
33-
architecture: x86_64
34-
memory: 4G
35-
operating_system: freebsd
36-
version: ${{matrix.version}}
37-
shell: bash
38-
sync_files: runner-to-vm
39-
shutdown_vm: false
40-
run: true
41-
- name: Install dependencies
42-
uses: cross-platform-actions/action@bf4c487506d60be13c9e4d72c1f430e2361efebf
31+
uses: cross-platform-actions/action@v1.2.0
4332
with:
4433
architecture: x86_64
4534
memory: 4G
4635
operating_system: freebsd
4736
version: ${{matrix.version}}
4837
shell: bash
4938
sync_files: false
50-
shutdown_vm: false
51-
run: |
52-
sudo pkg upgrade -y
53-
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
39+
- name: Sync files to VM
40+
shell: cpa.sh {0} --sync-files runner-to-vm
41+
run: true
42+
- name: Install dependencies
43+
shell: cpa.sh {0} --sync-files none
44+
run: |
45+
sudo pkg upgrade -y
46+
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
5447
- name: Build
55-
uses: cross-platform-actions/action@bf4c487506d60be13c9e4d72c1f430e2361efebf
56-
with:
57-
architecture: x86_64
58-
memory: 4G
59-
operating_system: freebsd
60-
version: ${{matrix.version}}
61-
shell: bash
62-
sync_files: false
63-
shutdown_vm: false
64-
run: |
65-
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' }}
48+
shell: cpa.sh {0} --sync-files none
49+
run: |
50+
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' }}
6651
- name: Test
67-
uses: cross-platform-actions/action@bf4c487506d60be13c9e4d72c1f430e2361efebf
68-
with:
69-
architecture: x86_64
70-
memory: 4G
71-
operating_system: freebsd
72-
version: ${{matrix.version}}
73-
shell: bash
74-
sync_files: false
75-
shutdown_vm: false
76-
run: |
77-
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
78-
- name: Shutdown VM
79-
uses: cross-platform-actions/action@bf4c487506d60be13c9e4d72c1f430e2361efebf
80-
with:
81-
architecture: x86_64
82-
memory: 4G
83-
operating_system: freebsd
84-
version: ${{matrix.version}}
85-
shell: bash
86-
sync_files: false
87-
shutdown_vm: true
88-
run: true
52+
shell: cpa.sh {0} --sync-files none
53+
run: |
54+
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

‎.github/workflows/OpenBSD-Makefile.yml‎

Lines changed: 20 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
include:
14+
- { version: '7.9', deps: sys }
15+
- { version: '7.9', deps: local }
16+
- { version: '7.9', deps: small }
1417
- { version: '7.8', deps: sys }
1518
- { version: '7.8', deps: small }
1619
- { version: '7.7', deps: sys }
@@ -32,63 +35,29 @@ jobs:
3235
- name: Checkout
3336
uses: actions/checkout@v4
3437
- name: Startup VM
35-
uses: cross-platform-actions/action@v1.0.0
36-
with:
37-
architecture: x86_64
38-
memory: 4G
39-
operating_system: openbsd
40-
version: ${{matrix.version}}
41-
shell: bash
42-
sync_files: runner-to-vm
43-
shutdown_vm: false
44-
run: true
45-
- name: Install dependencies
46-
uses: cross-platform-actions/action@v1.0.0
38+
uses: cross-platform-actions/action@v1.2.0
4739
with:
4840
architecture: x86_64
4941
memory: 4G
5042
operating_system: openbsd
5143
version: ${{matrix.version}}
5244
shell: bash
5345
sync_files: false
54-
shutdown_vm: false
55-
run: |
56-
sudo pkg_add -u
57-
sudo pkg_add -I ${{ (matrix.version == '7.8') && 'ghostscript-10.06.0' || (matrix.version == '7.7') && 'ghostscript-10.05.0' || (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' }}
58-
sudo pkg_add -I ${{ (matrix.version == '7.8') && 'autoconf-2.72p0 automake-1.18' || (matrix.version == '7.7') && 'autoconf-2.72p0 automake-1.17 pkgconf' || (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5 pkgconf' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5 pkgconf' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5 pkgconf' || 'autoconf automake pkgconf' }}
59-
sudo pkg_add -I subversion p5-XML-XPath git mawk gmake autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
46+
- name: Sync files to VM
47+
shell: cpa.sh {0} --sync-files runner-to-vm
48+
run: true
49+
- name: Install dependencies
50+
shell: cpa.sh {0} --sync-files none
51+
run: |
52+
sudo pkg_add -u
53+
sudo pkg_add -I ${{ (matrix.version == '7.9') && 'ghostscript-10.07.0' || (matrix.version == '7.8') && 'ghostscript-10.06.0' || (matrix.version == '7.7') && 'ghostscript-10.05.0' || (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' }}
54+
sudo pkg_add -I ${{ (matrix.version == '7.9') && 'autoconf-2.72p0 automake-1.18.1' || (matrix.version == '7.8') && 'autoconf-2.72p0 automake-1.18' || (matrix.version == '7.7') && 'autoconf-2.72p0 automake-1.17 pkgconf' || (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5 pkgconf' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5 pkgconf' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5 pkgconf' || 'autoconf automake pkgconf' }}
55+
sudo pkg_add -I subversion p5-XML-XPath git mawk gmake autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
6056
- name: Build
61-
uses: cross-platform-actions/action@v1.0.0
62-
with:
63-
architecture: x86_64
64-
memory: 4G
65-
operating_system: openbsd
66-
version: ${{matrix.version}}
67-
shell: bash
68-
sync_files: false
69-
shutdown_vm: false
70-
run: |
71-
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' }}
57+
shell: cpa.sh {0} --sync-files none
58+
run: |
59+
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' }}
7260
- name: Test
73-
uses: cross-platform-actions/action@v1.0.0
74-
with:
75-
architecture: x86_64
76-
memory: 4G
77-
operating_system: openbsd
78-
version: ${{matrix.version}}
79-
shell: bash
80-
sync_files: false
81-
shutdown_vm: false
82-
run: |
83-
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
84-
- name: Shutdown VM
85-
uses: cross-platform-actions/action@v1.0.0
86-
with:
87-
architecture: x86_64
88-
memory: 4G
89-
operating_system: openbsd
90-
version: ${{matrix.version}}
91-
shell: bash
92-
sync_files: false
93-
shutdown_vm: true
94-
run: true
61+
shell: cpa.sh {0} --sync-files none
62+
run: |
63+
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

0 commit comments

Comments
 (0)