Skip to content

Commit 0cab6b5

Browse files
authored
Update Dockerfile to use v3.0.0 image (#147)
* Update Dockerfile to use v2.0.0 image * Update Dockerfile to use v3.0.0 of hylo-dev-toolchain * Use MinSizeRel LLVM as fallback and supply environment variable at the correct place in CI
1 parent 41b547f commit 0cab6b5

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
ARG HYLO_LLVM_BUILD_TYPE=MinSizeRel
2-
FROM ghcr.io/hylo-lang/hylo-dev-toolchain:pr-15-1805f10
2+
3+
# Resolves empty string to MinSizeRel.
4+
FROM ghcr.io/hylo-lang/hylo-dev-toolchain:v3.0.0-${HYLO_LLVM_BUILD_TYPE:-MinSizeRel}

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"build": {
44
"dockerfile": "Dockerfile",
55
"args": {
6-
"HYLO_LLVM_BUILD_TYPE": "${localEnv:HYLO_LLVM_BUILD_TYPE:Debug}"
6+
"HYLO_LLVM_BUILD_TYPE": "${localEnv:HYLO_LLVM_BUILD_TYPE:MinSizeRel}"
77
}
88
},
99
"features": {

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ jobs:
5353
HYLO_LLVM_BUILD_TYPE: MinSizeRel
5454

5555
runs-on: ubuntu-24.04
56+
env:
57+
HYLO_LLVM_BUILD_TYPE: ${{ matrix.HYLO_LLVM_BUILD_TYPE }}
58+
5659
steps:
5760
- uses: actions/checkout@v4
5861
with:
@@ -68,8 +71,6 @@ jobs:
6871
- name: Build and run via CMake
6972
uses: devcontainers/ci@v0.3
7073
if: ${{ matrix.build-system == 'cmake' }}
71-
env:
72-
HYLO_LLVM_BUILD_TYPE: ${{ matrix.HYLO_LLVM_BUILD_TYPE }}
7374
with:
7475
runCmd: >
7576
set -exu # fail fast, print commands before executing, treat unset variables as an error

0 commit comments

Comments
 (0)