Skip to content
Snippets Groups Projects
Verified Commit 1c12d9a7 authored by Olivier Benz's avatar Olivier Benz
Browse files

Merge branch 'freeze-version'

parents 9f090dbb d7430a0e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.devcontainer/VERSION_MATRIX.md
+ 5
− 5
View file @ 1c12d9a7
......@@ -2,11 +2,11 @@
## Current
| GHC | Cabal[^1] | Stack[^1] | HLS |
|:----------------------------|:----------|:------------|:---------------------------------------- |
| latest<br>9.6.3<br>9.6<br>9 | 3.10.1.0 | ≥ 2.13.1 | latest<br>2.3.0.0<br>2.2.0.0 |
| 9.4.7<br>9.4 | 3.8.1.0 | ≥ 2.13.1 | 2.3.0.0<br>2.2.0.0<br>2.1.0.0<br>2.0.0.1 |
| 9.2.8<br>9.2 | 3.6.2.0 | ≥ 2.13.1 | 2.3.0.0<br>2.2.0.0<br>2.1.0.0<br>2.0.0.1 |
| GHC | Cabal[^1] | Stack[^1] | HLS |
|:----------------------------|:----------|:------------|:--------------------------------------------------- |
| latest<br>9.6.3<br>9.6<br>9 | 3.10.1.0 | ≥ 2.13.1 | latest<br>2.4.0.0<br>2.3.0.0<br>2.2.0.0 |
| 9.4.7<br>9.4 | 3.8.1.0 | ≥ 2.13.1 | 2.4.0.0<br>2.3.0.0<br>2.2.0.0<br>2.1.0.0<br>2.0.0.1 |
| 9.2.8<br>9.2 | 3.6.2.0 | ≥ 2.13.1 | 2.4.0.0<br>2.3.0.0<br>2.2.0.0<br>2.1.0.0<br>2.0.0.1 |
[^1]: built-in version; see [GHC musl > Version Matrix](../VERSION_MATRIX.md)
......
.devcontainer/ghc-9.4/devcontainer.json
+ 1
− 1
View file @ 1c12d9a7
......@@ -5,7 +5,7 @@
"context": "..",
"args": {
"GHC_VERSION": "9.4",
"HLS_VERSION": "2.3.0.0",
"HLS_VERSION": "2.4.0.0",
"USE_ZSH_FOR_ROOT": "unset-to-use-ash",
"SET_LANG": "C.UTF-8",
"SET_TZ": ""
......
.devcontainer/ghc-9.6/devcontainer.json
+ 1
− 1
View file @ 1c12d9a7
......@@ -5,7 +5,7 @@
"context": "..",
"args": {
"GHC_VERSION": "9.6",
"HLS_VERSION": "2.3.0.0",
"HLS_VERSION": "2.4.0.0",
"USE_ZSH_FOR_ROOT": "unset-to-use-ash",
"SET_LANG": "C.UTF-8",
"SET_TZ": ""
......
.gitlab-ci.yml
+ 22
− 1
View file @ 1c12d9a7
......@@ -3,7 +3,7 @@
GHC_VERSION: "9.6.3"
CABAL_VERSION: "3.10.1.0"
STACK_VERSION: "2.13.1"
HLS_VERSION: "2.3.0.0"
HLS_VERSION: "2.4.0.0"
BUILD_GHC: "true"
BUILD_HLS: "true"
......@@ -223,6 +223,13 @@ build-manifest:version-linux-multiarch:
$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
fi
docker manifest push $CI_APP_REPO:$CI_APP_TAG
- |
docker manifest create $CI_APP_REPO:$VERSION_MAJ_MIN $CI_MANIFEST_LIST
if echo $OS_ARCH | grep "linux-arm64v8" >/dev/null ; then
docker manifest annotate --variant v8 $CI_APP_REPO:$VERSION_MAJ_MIN \
$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
fi
docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN
rules:
- if: $BUILD_GHC == "true" && $CI_COMMIT_BRANCH == "freeze-version"
changes:
......@@ -373,6 +380,13 @@ build-package-hls-manifest:version-linux-multiarch:
$CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-arm64v8
fi
docker manifest push $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION
- |
docker manifest create $CI_APP_REPO/$VERSION_MAJ_MIN/hls:$HLS_VERSION $CI_MANIFEST_LIST
if echo $OS_ARCH | grep "linux-arm64v8" >/dev/null ; then
docker manifest annotate --variant v8 $CI_APP_REPO/$VERSION_MAJ_MIN/hls:$HLS_VERSION \
$CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-arm64v8
fi
docker manifest push $CI_APP_REPO/$VERSION_MAJ_MIN/hls:$HLS_VERSION
rules:
- if: $BUILD_HLS == "true" && $CI_COMMIT_BRANCH == "freeze-version"
changes:
......@@ -512,5 +526,12 @@ update-manifest:version-linux-multiarch:
$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
fi
docker manifest push $CI_APP_REPO:$CI_APP_TAG
- |
docker manifest create $CI_APP_REPO:$VERSION_MAJ_MIN $CI_MANIFEST_LIST
if echo $OS_ARCH | grep "linux-arm64v8" >/dev/null ; then
docker manifest annotate --variant v8 $CI_APP_REPO:$VERSION_MAJ_MIN \
$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
fi
docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN
rules:
- if: $UPDATE_STACK == "true" && $CI_COMMIT_BRANCH == "freeze-version"
packages/hls/2.4.0.0.Dockerfile 0 → 100644
+ 45
− 0
View file @ 1c12d9a7
ARG GHC_VERSION
ARG HLS_VERSION=2.4.0.0
FROM glcr.b-data.ch/ghc/ghc-musl:${GHC_VERSION} as builder
ARG HLS_VERSION
RUN apk add --no-cache patchelf findutils \
&& cd /tmp \
&& curl -sSL "https://github.com/haskell/haskell-language-server/archive/refs/tags/$HLS_VERSION.tar.gz" \
-o "haskell-language-server-$HLS_VERSION.tar.gz" \
&& tar -xzf "haskell-language-server-$HLS_VERSION.tar.gz" \
&& cd "haskell-language-server-$HLS_VERSION" \
&& . .github/scripts/env.sh \
&& . .github/scripts/common.sh \
&& sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project \
&& GHCS="$GHC_VERSION" \
&& export GHCS \
&& ARTIFACT="$(uname -m)-linux-alpine" \
&& export ARTIFACT \
&& cabal update \
&& emake hls-ghc \
&& emake bindist \
&& strip "out/bindist/$ARTIFACT/haskell-language-server-$HLS_VERSION/lib/$GHC_VERSION"/*.so \
&& emake bindist-tar
FROM alpine:3.18 as hls
ARG HLS_VERSION
COPY --from=builder /tmp/haskell-language-server-"$HLS_VERSION"/out/haskell-language-server-*-linux-alpine.tar.xz /tmp/
RUN apk add --no-cache build-base \
&& cd /tmp \
&& tar -xJf haskell-language-server-"$HLS_VERSION"-*-linux-alpine.tar.xz \
&& cd haskell-language-server-"$HLS_VERSION" \
&& make install
FROM scratch
ARG HLS_VERSION
ENV HLS_VERSION=${HLS_VERSION}
COPY --from=hls /usr/local /usr/local
prior/9.6.3.Dockerfile 0 → 100644
+ 156
− 0
View file @ 1c12d9a7
ARG GHC_VERSION=9.6.3
ARG CABAL_VERSION=3.10.1.0
ARG STACK_VERSION=2.13.1
ARG GHC_VERSION_BUILD=${GHC_VERSION}
ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
FROM glcr.b-data.ch/ghc/ghc-musl:9.4.7 as bootstrap
ARG GHC_VERSION_BUILD
ARG CABAL_VERSION_BUILD
ENV GHC_VERSION=${GHC_VERSION_BUILD} \
CABAL_VERSION=${CABAL_VERSION_BUILD}
RUN apk upgrade --no-cache \
&& apk add --no-cache \
autoconf \
automake \
binutils-gold \
build-base \
coreutils \
cpio \
curl \
gnupg \
linux-headers \
libffi-dev \
llvm14 \
ncurses-dev \
perl \
python3 \
xz \
zlib-dev
RUN cd /tmp \
&& curl -sSLO https://downloads.haskell.org/~ghc/"$GHC_VERSION"/ghc-"$GHC_VERSION"-src.tar.xz \
&& curl -sSLO https://downloads.haskell.org/~ghc/"$GHC_VERSION"/ghc-"$GHC_VERSION"-src.tar.xz.sig \
&& gpg --keyserver hkps://keyserver.ubuntu.com:443 \
--receive-keys 33C3A599DB85EA9B8BAA1866B202264020068BFB || \
gpg --keyserver hkp://keyserver.ubuntu.com:80 \
--receive-keys 33C3A599DB85EA9B8BAA1866B202264020068BFB \
&& gpg --verify "ghc-$GHC_VERSION-src.tar.xz.sig" "ghc-$GHC_VERSION-src.tar.xz" \
&& tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \
&& cd "ghc-$GHC_VERSION" \
&& ./boot.source \
&& ./configure --disable-ld-override LD=ld.gold \
# Use the LLVM backend
# Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
# so we can match the llvm vendor string alpine uses
&& sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
&& sed -i -e 's/unknown-linux-gnueabi/alpine-linux/g' llvm-targets \
&& sed -i -e 's/unknown-linux-gnu/alpine-linux/g' llvm-targets \
&& cabal update \
# See https://unix.stackexchange.com/questions/519092/what-is-the-logic-of-using-nproc-1-in-make-command
&& hadrian/build binary-dist -j"$(($(nproc)+1))" \
--flavour=perf+llvm+split_sections \
--docs=none \
# See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history
&& cabal install --allow-newer --constraint 'Cabal-syntax<3.11' "cabal-install-$CABAL_VERSION"
FROM alpine:3.18 as builder
LABEL org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.source="https://gitlab.b-data.ch/ghc/ghc-musl" \
org.opencontainers.image.vendor="Olivier Benz" \
org.opencontainers.image.authors="Olivier Benz <olivier.benz@b-data.ch>"
ARG GHC_VERSION_BUILD
ARG CABAL_VERSION_BUILD
ARG STACK_VERSION
ENV GHC_VERSION=${GHC_VERSION_BUILD} \
CABAL_VERSION=${CABAL_VERSION_BUILD} \
STACK_VERSION=${STACK_VERSION}
RUN apk add --no-cache \
bash \
build-base \
bzip2 \
bzip2-dev \
bzip2-static \
curl \
curl-static \
dpkg \
fakeroot \
git \
gmp-dev \
libcurl \
libffi \
libffi-dev \
llvm14 \
ncurses-dev \
ncurses-static \
openssl-dev \
openssl-libs-static \
pcre \
pcre-dev \
pcre2 \
pcre2-dev \
perl \
## Install shadow for `stack --docker`
shadow \
wget \
xz \
xz-dev \
zlib \
zlib-dev \
zlib-static
COPY --from=bootstrap /tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz /tmp/
RUN cd /tmp \
# Fix https://github.com/haskell/cabal/issues/8923
&& PKG_CONFIG_VERSION="$(pkg-config --version)" \
&& if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \
# Downgrade pkgconf from 1.9.x to 1.8.1
curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \
apk add --no-cache pkgconf-1.8.1-r0.apk; \
fi \
## Install GHC
&& tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \
&& cd ghc-"$GHC_VERSION"-*-alpine-linux \
&& ./configure --disable-ld-override \
&& make install \
## Install Stack
&& cd /tmp \
&& curl -sSLO https://github.com/commercialhaskell/stack/releases/download/v"$STACK_VERSION"/stack-"$STACK_VERSION"-linux-"$(uname -m)".tar.gz \
&& curl -sSLO https://github.com/commercialhaskell/stack/releases/download/v"$STACK_VERSION"/stack-"$STACK_VERSION"-linux-"$(uname -m)".tar.gz.sha256 \
&& sha256sum -cs stack-"$STACK_VERSION"-linux-"$(uname -m)".tar.gz.sha256 \
&& tar -xzf stack-"$STACK_VERSION"-linux-"$(uname -m)".tar.gz \
&& mv stack-"$STACK_VERSION"-linux-"$(uname -m)"/stack /usr/local/bin/stack \
## Clean up
&& rm -rf /tmp/*
## Install Cabal
COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal
FROM builder as tester
WORKDIR /usr/local/src
COPY Main.hs Main.hs
RUN ghc -static -optl-pthread -optl-static Main.hs \
&& file Main \
&& ./Main \
# Test cabal workflow
&& mkdir cabal-test \
&& cd cabal-test \
&& cabal update \
&& cabal init -n --is-executable -p tester -l MIT \
&& cabal run
FROM builder as final
CMD ["ghci"]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment