Skip to content

Commit 4cef268

Browse files
manxoristmanxorist
committed
Merged revision(s) 25342-25343 from trunk/OpenMPT:
[Fix] build: CI: GitHub: CPA: Haiku: Do full system upgrade before building. [Var] build: CI: GitHub: CPA: Haiku: Update CPA to v1.1.0 (2026-05-17). ........ [Fix] build: CI: GitHub: CPA: Haiku: Do another reboot after installing dependencies. Haiku may sometimes require it. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.32@25344 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent 0f6c3d1 commit 4cef268

2 files changed

Lines changed: 45 additions & 105 deletions

File tree

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

Lines changed: 21 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -23,60 +23,34 @@ jobs:
2323
- name: Checkout
2424
uses: actions/checkout@v4
2525
- name: Startup VM
26-
uses: cross-platform-actions/action@v1.0.0
26+
uses: cross-platform-actions/action@v1.1.0
2727
with:
2828
architecture: x86_64
2929
memory: 4G
3030
operating_system: haiku
3131
version: ${{matrix.version}}
3232
shell: bash
3333
sync_files: false
34-
shutdown_vm: false
35-
run: true
3634
- name: Sync files to VM
37-
uses: cross-platform-actions/action@v1.0.0
38-
with:
39-
architecture: x86_64
40-
memory: 4G
41-
operating_system: haiku
42-
version: ${{matrix.version}}
43-
shell: bash
44-
sync_files: runner-to-vm
45-
shutdown_vm: false
46-
run: true
35+
shell: cpa.sh {0} --sync-files runner-to-vm
36+
run: true
37+
- name: Update system
38+
shell: cpa.sh {0} --sync-files none
39+
run: |
40+
pkgman refresh
41+
pkgman full-sync -y
42+
- name: Reboot VM
43+
shell: cpa.sh {0} --sync-files none --reboot
44+
run: true
4745
- name: Install dependencies
48-
uses: cross-platform-actions/action@v1.0.0
49-
with:
50-
architecture: x86_64
51-
memory: 4G
52-
operating_system: haiku
53-
version: ${{matrix.version}}
54-
shell: bash
55-
sync_files: false
56-
shutdown_vm: false
57-
run: |
58-
pkgman refresh
59-
pkgman install -y subversion git perl gawk make pkgconfig mpg123_devel libogg_devel libvorbis_devel flac_devel libsndfile_devel portaudio_devel libsdl2_devel autoconf autoconf_archive libtool libtool_libltdl doxygen help2man
46+
shell: cpa.sh {0} --sync-files none
47+
run: |
48+
pkgman refresh
49+
pkgman install -y subversion git perl gawk make pkgconfig mpg123_devel libogg_devel libvorbis_devel flac_devel libsndfile_devel portaudio_devel libsdl2_devel autoconf autoconf_archive libtool libtool_libltdl doxygen help2man
50+
- name: Reboot VM
51+
shell: cpa.sh {0} --sync-files none --reboot
52+
run: true
6053
- name: Build
61-
uses: cross-platform-actions/action@v1.0.0
62-
with:
63-
architecture: x86_64
64-
memory: 4G
65-
operating_system: haiku
66-
version: ${{matrix.version}}
67-
shell: bash
68-
sync_files: false
69-
shutdown_vm: false
70-
run: |
71-
export MAKEFLAGS="-j4"; ./build/autotools/autoconfiscate.sh
72-
- name: Shutdown VM
73-
uses: cross-platform-actions/action@v1.0.0
74-
with:
75-
architecture: x86_64
76-
memory: 4G
77-
operating_system: haiku
78-
version: ${{matrix.version}}
79-
shell: bash
80-
sync_files: false
81-
shutdown_vm: true
82-
run: true
54+
shell: cpa.sh {0} --sync-files none
55+
run: |
56+
export MAKEFLAGS="-j4"; ./build/autotools/autoconfiscate.sh

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

Lines changed: 24 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -25,72 +25,38 @@ jobs:
2525
- name: Checkout
2626
uses: actions/checkout@v4
2727
- name: Startup VM
28-
uses: cross-platform-actions/action@v1.0.0
28+
uses: cross-platform-actions/action@v1.1.0
2929
with:
3030
architecture: x86_64
3131
memory: 4G
3232
operating_system: haiku
3333
version: ${{matrix.version}}
3434
shell: bash
3535
sync_files: false
36-
shutdown_vm: false
37-
run: true
3836
- name: Sync files to VM
39-
uses: cross-platform-actions/action@v1.0.0
40-
with:
41-
architecture: x86_64
42-
memory: 4G
43-
operating_system: haiku
44-
version: ${{matrix.version}}
45-
shell: bash
46-
sync_files: runner-to-vm
47-
shutdown_vm: false
48-
run: true
37+
shell: cpa.sh {0} --sync-files runner-to-vm
38+
run: true
39+
- name: Update system
40+
shell: cpa.sh {0} --sync-files none
41+
run: |
42+
pkgman refresh
43+
pkgman full-sync -y
44+
- name: Reboot VM
45+
shell: cpa.sh {0} --sync-files none --reboot
46+
run: true
4947
- name: Install dependencies
50-
uses: cross-platform-actions/action@v1.0.0
51-
with:
52-
architecture: x86_64
53-
memory: 4G
54-
operating_system: haiku
55-
version: ${{matrix.version}}
56-
shell: bash
57-
sync_files: false
58-
shutdown_vm: false
59-
run: |
60-
pkgman refresh
61-
pkgman install -y subversion git perl gawk make pkgconfig mpg123_devel libogg_devel libvorbis_devel flac_devel libsndfile_devel portaudio_devel libsdl2_devel autoconf autoconf_archive libtool libtool_libltdl doxygen help2man
48+
shell: cpa.sh {0} --sync-files none
49+
run: |
50+
pkgman refresh
51+
pkgman install -y subversion git perl gawk make pkgconfig mpg123_devel libogg_devel libvorbis_devel flac_devel libsndfile_devel portaudio_devel libsdl2_devel autoconf autoconf_archive libtool libtool_libltdl doxygen help2man
52+
- name: Reboot VM
53+
shell: cpa.sh {0} --sync-files none --reboot
54+
run: true
6255
- name: Build
63-
uses: cross-platform-actions/action@v1.0.0
64-
with:
65-
architecture: x86_64
66-
memory: 4G
67-
operating_system: haiku
68-
version: ${{matrix.version}}
69-
shell: bash
70-
sync_files: false
71-
shutdown_vm: false
72-
run: |
73-
make -j4 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' }}
56+
shell: cpa.sh {0} --sync-files none
57+
run: |
58+
make -j4 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' }}
7459
- name: Test
75-
uses: cross-platform-actions/action@v1.0.0
76-
with:
77-
architecture: x86_64
78-
memory: 4G
79-
operating_system: haiku
80-
version: ${{matrix.version}}
81-
shell: bash
82-
sync_files: false
83-
shutdown_vm: false
84-
run: |
85-
make -j4 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
86-
- name: Shutdown VM
87-
uses: cross-platform-actions/action@v1.0.0
88-
with:
89-
architecture: x86_64
90-
memory: 4G
91-
operating_system: haiku
92-
version: ${{matrix.version}}
93-
shell: bash
94-
sync_files: false
95-
shutdown_vm: true
96-
run: true
60+
shell: cpa.sh {0} --sync-files none
61+
run: |
62+
make -j4 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)