Skip to content

Commit

Permalink
ci: Add macos installer
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonah Beckford committed Nov 25, 2023
1 parent a241f8c commit 2aa31a2
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 3 deletions.
23 changes: 22 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ include:
# { dkml_host_os: 'darwin',
# opam_root_cacheable: '${CI_PROJECT_DIR}/.ci/o',
# abi_pattern: 'macos-darwin_all',
# gl_image: 'macos-12-xcode-14s',
# gl_image: 'macos-12-xcode-14',
# bootstrap_opam_version: '2.2.0-alpha-20221228',
# dkml_host_abi: 'darwin_arm64',
# opam_root: '${CI_PROJECT_DIR}/.ci/o' },
Expand Down Expand Up @@ -95,3 +95,24 @@ variables:
- apt-get install -qq -o=Dpkg::Use-Pty=0 ninja-build build-essential git unzip libsqlite3-dev libx11-dev pkg-config > /dev/null
# Install CMake
- ./dk dksdk.cmake.link QUIET

.cmake-with-opam-prereqs-macos:build:
tags: [saas-macos-medium-m1]
image: macos-12-xcode-14
# prettier-ignore
parallel:
matrix: [
{ dkml_host_os: 'darwin',
opam_root_cacheable: '${CI_PROJECT_DIR}/.ci/o',
abi_pattern: 'macos-darwin_all',
gl_image: 'macos-12-xcode-14',
bootstrap_opam_version: '2.2.0-alpha-20221228',
dkml_host_abi: 'darwin_arm64',
opam_root: '${CI_PROJECT_DIR}/.ci/o' },

]
before_script:
# gpatch: needed by opam
- brew install ninja gpatch git unzip sqlite pkg-config
# Install CMake
- ./dk dksdk.cmake.link QUIET
12 changes: 12 additions & 0 deletions .gitlab/ci/test.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@ installer-debian_x86_64:
- .ci/cmake/bin/cmake --preset ci-reproduce -G Ninja -D DKML_HOST_LINUX_DOCKER=0
- .ci/cmake/bin/cmake --build --preset ci-reproduce

installer-darwin_arm64:
extends:
- .cmake-with-opam-prereqs-macos:build
- .installer-unix
stage: build
script:
# Identity for dkml-compiler git-based patches
- git config --global user.email "anyone@example.com"

- .ci/cmake/bin/cmake --preset ci-reproduce -G Ninja
- .ci/cmake/bin/cmake --build --preset ci-reproduce

installer-linux_x86_64:
extends:
- .linux:setup-dkml-no-matrix
Expand Down
4 changes: 2 additions & 2 deletions CMakePresetsGenerated.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"value": "dd4bead690f9f67a7487064694c6e2dbde65e361"
},
"dkml-installer-ocaml_GIT_TAG": {
"value": "c58aa0ccd87c248e775ead12d4e29eae89c1c019"
"value": "c98fafdee2c4b3fcc9627c8d05800bed43c0a2de"
},
"dkml-installer-ocaml-byte_GIT_TAG": {
"value": "6533b83bc1b77fc5295c6076191009dc476cd91d"
"value": "e38e59c8a994b341ac26f92421b8ba883a308a38"
},
"diskuv-opam-repository_GIT_TAG": {
"value": "c5078092123f219c2b2be17fa8ee8d940185c46a"
Expand Down

0 comments on commit 2aa31a2

Please sign in to comment.