From: <sv...@op...> - 2024-03-08 15:05:55
|
Author: manx Date: Fri Mar 8 16:05:40 2024 New Revision: 20292 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20292 Log: Merged revision(s) 20291 from trunk/OpenMPT: [Fix] build: CI: GitHub: Properly quote version numbers. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) +++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) @@ -10,12 +10,12 @@ strategy: matrix: include: - - { version: 14.0, deps: sys } - - { version: 14.0, deps: local } - - { version: 14.0, deps: small } - - { version: 13.3, deps: sys } - - { version: 13.3, deps: local } - - { version: 13.3, deps: small } + - { version: '14.0', deps: sys } + - { version: '14.0', deps: local } + - { version: '14.0', deps: small } + - { version: '13.3', deps: sys } + - { version: '13.3', deps: local } + - { version: '13.3', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) @@ -10,9 +10,9 @@ strategy: matrix: include: - - { version: 9.3, deps: sys } - - { version: 9.3, deps: local } - - { version: 9.3, deps: small } + - { version: '9.3', deps: sys } + - { version: '9.3', deps: local } + - { version: '9.3', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) +++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) @@ -10,9 +10,9 @@ strategy: matrix: include: - - { version: 7.4, deps: sys } - - { version: 7.4, deps: local } - - { version: 7.4, deps: small } + - { version: '7.4', deps: sys } + - { version: '7.4', deps: local } + - { version: '7.4', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) @@ -10,30 +10,30 @@ strategy: matrix: include: - - { host: macos-14, compiler: 15.2, arch: '' , target: '' , deps: sys, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: '' , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: '' , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: '' , deps: small, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: '' , deps: small, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 14 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 14 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 13 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 13 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 12 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 12 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 11 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 11 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.15, deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.14, deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: i386 , target: 10.14, deps: local, check: false } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-13, compiler: 15.2, arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-13, compiler: 15.2, arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-12, compiler: 14.2, arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: small, check: true } - - { host: macos-12, compiler: 14.2, arch: i386 , target: 10.13, deps: small, check: false } + - { host: macos-14, compiler: '15.2', arch: '' , target: '' , deps: sys, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 14 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 14 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 13 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 13 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 12 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 12 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 11 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 11 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.15, deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.14, deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: i386 , target: 10.14, deps: local, check: false } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } + - { host: macos-13, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } + - { host: macos-13, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } + - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: local, check: true } + - { host: macos-12, compiler: '14.2', arch: i386 , target: 10.13, deps: local, check: false } + - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: small, check: true } + - { host: macos-12, compiler: '14.2', arch: i386 , target: 10.13, deps: small, check: false } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}} cancel-in-progress: true |