Skip to content

Commit 25a8860

Browse files
committed
Remove vestigial docker references in CI scripts (docker was only used for Ubuntu 18.04 which we no longer support)
1 parent 4a936ad commit 25a8860

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

.github/workflows/cppcmake.yml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,11 @@ jobs:
3939
- {name: "ubuntu-24.04", os: "ubuntu-24.04", cmake_extra: "-DLSL_BUNDLED_PUGIXML=OFF" }
4040
- {name: "windows-x64", os: "windows-latest", cmake_extra: "-T v142,host=x86"}
4141
- {name: "windows-32", os: "windows-latest", cmake_extra: "-T v142,host=x86 -A Win32"}
42-
- {name: "macOS-latest", os: "macOS-latest", cmake_extra: "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 DCMAKE_SYSTEM_NAME=Darwin -DLSL_FRAMEWORK=ON -G Xcode" }
43-
44-
# runs all steps in the container configured in config.docker or as subprocesses when empty
45-
container: ${{ matrix.config.docker }}
42+
- {name: "macOS-latest", os: "macOS-latest", cmake_extra: "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DLSL_FRAMEWORK=ON" }
43+
4644
steps:
4745
- uses: actions/checkout@v4
4846

49-
- name: set up build environment in container
50-
if: ${{ matrix.config.docker }}
51-
run: |
52-
set -x
53-
apt update
54-
apt install -y --no-install-recommends g++ git ninja-build file dpkg-dev lsb-release sudo curl cmake libpugixml-dev
55-
56-
- name: Setup Xcode
57-
if: ${{ matrix.config.name == 'macOS-latest' }}
58-
uses: maxim-lobanov/setup-xcode@v1
59-
with:
60-
xcode-version: 'latest-stable'
61-
6247
- name: Configure CMake
6348
run: |
6449
if [[ "${{ matrix.config.name }}" = ubuntu-2* ]]; then
@@ -136,15 +121,15 @@ jobs:
136121
ip -6 route
137122
fi
138123
139-
# run internal tests, ignore test failures on docker (missing IPv6 connectivity)
124+
# run internal tests
140125
- name: unit tests
141126
run: |
142127
if [[ "${{ matrix.config.name }}" = ubuntu-2* ]]; then
143128
ulimit -c unlimited
144129
echo "$PWD/dumps/corefile-%e-%p-%t" | sudo tee /proc/sys/kernel/core_pattern
145130
fi
146131
mkdir -p dumps
147-
install/bin/lsl_test_internal --order rand --wait-for-keypress never --durations yes || test ! -z "${{ matrix.config.docker }}"
132+
install/bin/lsl_test_internal --order rand --wait-for-keypress never --durations yes
148133
install/bin/lsl_test_exported --order rand --wait-for-keypress never --durations yes
149134
timeout-minutes: 10
150135

0 commit comments

Comments
 (0)