Menu
▾
▴
[OMPT-svn-commit] OpenMPT r25344 - in branches/OpenMPT-1.32: . .github/workflows
|
From: <sv...@op...> - 2026-05-22 11:43:03
|
Author: manx Date: Fri May 22 13:42:51 2026 New Revision: 25344 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25344 Log: 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. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/.github/workflows/Haiku-Autotools.yml branches/OpenMPT-1.32/.github/workflows/Haiku-Makefile.yml Modified: branches/OpenMPT-1.32/.github/workflows/Haiku-Autotools.yml ============================================================================== --- branches/OpenMPT-1.32/.github/workflows/Haiku-Autotools.yml Fri May 22 13:41:16 2026 (r25343) +++ branches/OpenMPT-1.32/.github/workflows/Haiku-Autotools.yml Fri May 22 13:42:51 2026 (r25344) @@ -23,7 +23,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v1.0.0 + uses: cross-platform-actions/action@v1.1.0 with: architecture: x86_64 memory: 4G @@ -31,52 +31,26 @@ version: ${{matrix.version}} shell: bash sync_files: false - shutdown_vm: false - run: true - name: Sync files to VM - uses: cross-platform-actions/action@v1.0.0 - with: - architecture: x86_64 - memory: 4G - operating_system: haiku - version: ${{matrix.version}} - shell: bash - sync_files: runner-to-vm - shutdown_vm: false - run: true + shell: cpa.sh {0} --sync-files runner-to-vm + run: true + - name: Update system + shell: cpa.sh {0} --sync-files none + run: | + pkgman refresh + pkgman full-sync -y + - name: Reboot VM + shell: cpa.sh {0} --sync-files none --reboot + run: true - name: Install dependencies - uses: cross-platform-actions/action@v1.0.0 - with: - architecture: x86_64 - memory: 4G - operating_system: haiku - version: ${{matrix.version}} - shell: bash - sync_files: false - shutdown_vm: false - run: | - pkgman refresh - 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 + shell: cpa.sh {0} --sync-files none + run: | + pkgman refresh + 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 + - name: Reboot VM + shell: cpa.sh {0} --sync-files none --reboot + run: true - name: Build - uses: cross-platform-actions/action@v1.0.0 - with: - architecture: x86_64 - memory: 4G - operating_system: haiku - version: ${{matrix.version}} - shell: bash - sync_files: false - shutdown_vm: false - run: | - export MAKEFLAGS="-j4"; ./build/autotools/autoconfiscate.sh - - name: Shutdown VM - uses: cross-platform-actions/action@v1.0.0 - with: - architecture: x86_64 - memory: 4G - operating_system: haiku - version: ${{matrix.version}} - shell: bash - sync_files: false - shutdown_vm: true - run: true + shell: cpa.sh {0} --sync-files none + run: | + export MAKEFLAGS="-j4"; ./build/autotools/autoconfiscate.sh Modified: branches/OpenMPT-1.32/.github/workflows/Haiku-Makefile.yml ============================================================================== --- branches/OpenMPT-1.32/.github/workflows/Haiku-Makefile.yml Fri May 22 13:41:16 2026 (r25343) +++ branches/OpenMPT-1.32/.github/workflows/Haiku-Makefile.yml Fri May 22 13:42:51 2026 (r25344) @@ -25,7 +25,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v1.0.0 + uses: cross-platform-actions/action@v1.1.0 with: architecture: x86_64 memory: 4G @@ -33,64 +33,30 @@ version: ${{matrix.version}} shell: bash sync_files: false - shutdown_vm: false - run: true - name: Sync files to VM - uses: cross-platform-actions/action@v1.0.0 - with: - architecture: x86_64 - memory: 4G - operating_system: haiku - version: ${{matrix.version}} - shell: bash - sync_files: runner-to-vm - shutdown_vm: false - run: true + shell: cpa.sh {0} --sync-files runner-to-vm + run: true + - name: Update system + shell: cpa.sh {0} --sync-files none + run: | + pkgman refresh + pkgman full-sync -y + - name: Reboot VM + shell: cpa.sh {0} --sync-files none --reboot + run: true - name: Install dependencies - uses: cross-platform-actions/action@v1.0.0 - with: - architecture: x86_64 - memory: 4G - operating_system: haiku - version: ${{matrix.version}} - shell: bash - sync_files: false - shutdown_vm: false - run: | - pkgman refresh - 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 + shell: cpa.sh {0} --sync-files none + run: | + pkgman refresh + 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 + - name: Reboot VM + shell: cpa.sh {0} --sync-files none --reboot + run: true - name: Build - uses: cross-platform-actions/action@v1.0.0 - with: - architecture: x86_64 - memory: 4G - operating_system: haiku - version: ${{matrix.version}} - shell: bash - sync_files: false - shutdown_vm: false - run: | - 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' }} + shell: cpa.sh {0} --sync-files none + run: | + 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' }} - name: Test - uses: cross-platform-actions/action@v1.0.0 - with: - architecture: x86_64 - memory: 4G - operating_system: haiku - version: ${{matrix.version}} - shell: bash - sync_files: false - shutdown_vm: false - run: | - 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 - - name: Shutdown VM - uses: cross-platform-actions/action@v1.0.0 - with: - architecture: x86_64 - memory: 4G - operating_system: haiku - version: ${{matrix.version}} - shell: bash - sync_files: false - shutdown_vm: true - run: true + shell: cpa.sh {0} --sync-files none + run: | + 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 |
