Skip to content

Commit a4f8985

Browse files
committed
Switch to external cmake feature
1 parent c611470 commit a4f8985

File tree

4 files changed

+9
-73
lines changed

4 files changed

+9
-73
lines changed

.devcontainer/Dockerfile

-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
FROM mcr.microsoft.com/devcontainers/cpp:1-ubuntu-24.04
22

3-
ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="3.29.3"
4-
5-
COPY ./reinstall-cmake.sh /tmp/
6-
7-
RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
8-
chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
9-
fi \
10-
&& rm -f /tmp/reinstall-cmake.sh
11-
123
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
134
&& apt-get -y install --no-install-recommends \
145
software-properties-common fish

.devcontainer/devcontainer.json

+8
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,13 @@
33
"build": {
44
"dockerfile": "Dockerfile"
55
},
6+
"features": {
7+
// Switch to the "official" version as soon as
8+
// https://github.com/devcontainers-community/features-cmake/pull/2
9+
// merged
10+
"ghcr.io/alexdenisov/features/feature-cmake": {
11+
"version": "3.29.3"
12+
}
13+
},
614
"postCreateCommand": "sh .devcontainer/post_create.sh"
715
}

.devcontainer/reinstall-cmake.sh

-59
This file was deleted.

.github/workflows/macos-ci.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ on:
66
branches: ["main"]
77
jobs:
88
build-and-test:
9-
runs-on: ${{ matrix.os }}
10-
strategy:
11-
fail-fast: false
12-
matrix:
13-
os: [macos-latest]
9+
runs-on: macos-latest
1410
steps:
1511
- uses: actions/checkout@v4
1612
with:

0 commit comments

Comments
 (0)