Skip to content

Commit 7b7e530

Browse files
manxoristmanxorist
committed
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.32@25353 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent 4cef268 commit 7b7e530

10 files changed

Lines changed: 130 additions & 366 deletions

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

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,49 +25,23 @@ jobs:
2525
- name: Checkout
2626
uses: actions/checkout@v4
2727
- name: Startup VM
28-
uses: cross-platform-actions/action@bf4c487506d60be13c9e4d72c1f430e2361efebf
29-
with:
30-
architecture: x86_64
31-
memory: 4G
32-
operating_system: freebsd
33-
version: ${{matrix.version}}
34-
shell: bash
35-
sync_files: runner-to-vm
36-
shutdown_vm: false
37-
run: true
38-
- name: Install dependencies
39-
uses: cross-platform-actions/action@bf4c487506d60be13c9e4d72c1f430e2361efebf
28+
uses: cross-platform-actions/action@v1.2.0
4029
with:
4130
architecture: x86_64
4231
memory: 4G
4332
operating_system: freebsd
4433
version: ${{matrix.version}}
4534
shell: bash
4635
sync_files: false
47-
shutdown_vm: false
48-
run: |
49-
sudo pkg upgrade -y
50-
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
36+
- name: Sync files to VM
37+
shell: cpa.sh {0} --sync-files runner-to-vm
38+
run: true
39+
- name: Install dependencies
40+
shell: cpa.sh {0} --sync-files none
41+
run: |
42+
sudo pkg upgrade -y
43+
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
5144
- name: Build
52-
uses: cross-platform-actions/action@bf4c487506d60be13c9e4d72c1f430e2361efebf
53-
with:
54-
architecture: x86_64
55-
memory: 4G
56-
operating_system: freebsd
57-
version: ${{matrix.version}}
58-
shell: bash
59-
sync_files: false
60-
shutdown_vm: false
61-
run: |
62-
export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh
63-
- name: Shutdown VM
64-
uses: cross-platform-actions/action@bf4c487506d60be13c9e4d72c1f430e2361efebf
65-
with:
66-
architecture: x86_64
67-
memory: 4G
68-
operating_system: freebsd
69-
version: ${{matrix.version}}
70-
shell: bash
71-
sync_files: false
72-
shutdown_vm: true
73-
run: true
45+
shell: cpa.sh {0} --sync-files none
46+
run: |
47+
export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Checkout
2424
uses: actions/checkout@v4
2525
- name: Startup VM
26-
uses: cross-platform-actions/action@v1.1.0
26+
uses: cross-platform-actions/action@v1.2.0
2727
with:
2828
architecture: x86_64
2929
memory: 4G

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Checkout
2626
uses: actions/checkout@v4
2727
- name: Startup VM
28-
uses: cross-platform-actions/action@v1.1.0
28+
uses: cross-platform-actions/action@v1.2.0
2929
with:
3030
architecture: x86_64
3131
memory: 4G

‎.github/workflows/MidnightBSD-Autotools.yml‎

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,50 +23,24 @@ jobs:
2323
- name: Checkout
2424
uses: actions/checkout@v4
2525
- name: Startup VM
26-
uses: cross-platform-actions/action@13ec3be3fbdfe52a660fe21c83f332747ed878be
27-
with:
28-
architecture: x86_64
29-
memory: 4G
30-
operating_system: midnightbsd
31-
version: ${{matrix.version}}
32-
shell: bash
33-
sync_files: runner-to-vm
34-
shutdown_vm: false
35-
run: true
36-
- name: Install dependencies
37-
uses: cross-platform-actions/action@13ec3be3fbdfe52a660fe21c83f332747ed878be
26+
uses: cross-platform-actions/action@v1.2.0
3827
with:
3928
architecture: x86_64
4029
memory: 4G
4130
operating_system: midnightbsd
4231
version: ${{matrix.version}}
4332
shell: bash
4433
sync_files: false
45-
shutdown_vm: false
46-
run: |
47-
sudo mport index
48-
sudo mport upgrade
49-
sudo mport install subversion p5-XML-TreePP git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 || true
34+
- name: Sync files to VM
35+
shell: cpa.sh {0} --sync-files runner-to-vm
36+
run: true
37+
- name: Install dependencies
38+
shell: cpa.sh {0} --sync-files none
39+
run: |
40+
sudo mport index
41+
sudo mport upgrade
42+
sudo mport install subversion p5-XML-TreePP git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 || true
5043
- name: Build
51-
uses: cross-platform-actions/action@13ec3be3fbdfe52a660fe21c83f332747ed878be
52-
with:
53-
architecture: x86_64
54-
memory: 4G
55-
operating_system: midnightbsd
56-
version: ${{matrix.version}}
57-
shell: bash
58-
sync_files: false
59-
shutdown_vm: false
60-
run: |
61-
export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh
62-
- name: Shutdown VM
63-
uses: cross-platform-actions/action@13ec3be3fbdfe52a660fe21c83f332747ed878be
64-
with:
65-
architecture: x86_64
66-
memory: 4G
67-
operating_system: midnightbsd
68-
version: ${{matrix.version}}
69-
shell: bash
70-
sync_files: false
71-
shutdown_vm: true
72-
run: true
44+
shell: cpa.sh {0} --sync-files none
45+
run: |
46+
export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh

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

Lines changed: 16 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -25,62 +25,28 @@ jobs:
2525
- name: Checkout
2626
uses: actions/checkout@v4
2727
- name: Startup VM
28-
uses: cross-platform-actions/action@13ec3be3fbdfe52a660fe21c83f332747ed878be
29-
with:
30-
architecture: x86_64
31-
memory: 4G
32-
operating_system: midnightbsd
33-
version: ${{matrix.version}}
34-
shell: bash
35-
sync_files: runner-to-vm
36-
shutdown_vm: false
37-
run: true
38-
- name: Install dependencies
39-
uses: cross-platform-actions/action@13ec3be3fbdfe52a660fe21c83f332747ed878be
28+
uses: cross-platform-actions/action@v1.2.0
4029
with:
4130
architecture: x86_64
4231
memory: 4G
4332
operating_system: midnightbsd
4433
version: ${{matrix.version}}
4534
shell: bash
4635
sync_files: false
47-
shutdown_vm: false
48-
run: |
49-
sudo mport index
50-
sudo mport upgrade
51-
sudo mport install subversion p5-XML-TreePP git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 || true
36+
- name: Sync files to VM
37+
shell: cpa.sh {0} --sync-files runner-to-vm
38+
run: true
39+
- name: Install dependencies
40+
shell: cpa.sh {0} --sync-files none
41+
run: |
42+
sudo mport index
43+
sudo mport upgrade
44+
sudo mport install subversion p5-XML-TreePP git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 || true
5245
- name: Build
53-
uses: cross-platform-actions/action@13ec3be3fbdfe52a660fe21c83f332747ed878be
54-
with:
55-
architecture: x86_64
56-
memory: 4G
57-
operating_system: midnightbsd
58-
version: ${{matrix.version}}
59-
shell: bash
60-
sync_files: false
61-
shutdown_vm: false
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' }}
46+
shell: cpa.sh {0} --sync-files none
47+
run: |
48+
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' }}
6449
- name: Test
65-
uses: cross-platform-actions/action@13ec3be3fbdfe52a660fe21c83f332747ed878be
66-
with:
67-
architecture: x86_64
68-
memory: 4G
69-
operating_system: midnightbsd
70-
version: ${{matrix.version}}
71-
shell: bash
72-
sync_files: false
73-
shutdown_vm: false
74-
run: |
75-
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
76-
- name: Shutdown VM
77-
uses: cross-platform-actions/action@13ec3be3fbdfe52a660fe21c83f332747ed878be
78-
with:
79-
architecture: x86_64
80-
memory: 4G
81-
operating_system: midnightbsd
82-
version: ${{matrix.version}}
83-
shell: bash
84-
sync_files: false
85-
shutdown_vm: true
86-
run: true
50+
shell: cpa.sh {0} --sync-files none
51+
run: |
52+
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/NetBSD-Autotools.yml‎

Lines changed: 17 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -24,54 +24,28 @@ jobs:
2424
- name: Checkout
2525
uses: actions/checkout@v4
2626
- name: Startup VM
27-
uses: cross-platform-actions/action@v1.0.0
28-
with:
29-
architecture: x86_64
30-
memory: 4G
31-
operating_system: netbsd
32-
version: ${{matrix.version}}
33-
shell: bash
34-
sync_files: runner-to-vm
35-
shutdown_vm: false
36-
run: true
37-
- name: Install dependencies
38-
uses: cross-platform-actions/action@v1.0.0
27+
uses: cross-platform-actions/action@v1.2.0
3928
with:
4029
architecture: x86_64
4130
memory: 4G
4231
operating_system: netbsd
4332
version: ${{matrix.version}}
4433
shell: bash
4534
sync_files: false
46-
shutdown_vm: false
47-
run: |
48-
sudo pkgin -y update
49-
sudo pkgin -y full-upgrade
50-
sudo pkgin -y install subversion-base git p5-XML-XPath mawk
51-
sudo pkgin -y install gmake pkgconf
52-
sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2
53-
sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl
54-
sudo pkgin -y install doxygen help2man
35+
- name: Sync files to VM
36+
shell: cpa.sh {0} --sync-files runner-to-vm
37+
run: true
38+
- name: Install dependencies
39+
shell: cpa.sh {0} --sync-files none
40+
run: |
41+
sudo pkgin -y update
42+
sudo pkgin -y full-upgrade
43+
sudo pkgin -y install subversion-base git p5-XML-XPath mawk
44+
sudo pkgin -y install gmake pkgconf
45+
sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2
46+
sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl
47+
sudo pkgin -y install doxygen help2man
5548
- name: Build
56-
uses: cross-platform-actions/action@v1.0.0
57-
with:
58-
architecture: x86_64
59-
memory: 4G
60-
operating_system: netbsd
61-
version: ${{matrix.version}}
62-
shell: bash
63-
sync_files: false
64-
shutdown_vm: false
65-
run: |
66-
export MAKEFLAGS="-j4"; ./build/autotools/autoconfiscate.sh
67-
- name: Shutdown VM
68-
uses: cross-platform-actions/action@v1.0.0
69-
with:
70-
architecture: x86_64
71-
memory: 4G
72-
operating_system: netbsd
73-
version: ${{matrix.version}}
74-
shell: bash
75-
sync_files: false
76-
shutdown_vm: true
77-
run: true
49+
shell: cpa.sh {0} --sync-files none
50+
run: |
51+
export MAKEFLAGS="-j4"; ./build/autotools/autoconfiscate.sh

0 commit comments

Comments
 (0)