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

Tweaks to build HLS 2.2.0.0 for GHC v9.4.7

parent bb2967d8
Branches
No related tags found
No related merge requests found
Pipeline #23769 passed
Stage: build2
Hide whitespace changes
Inline Side-by-side
Showing
with 23 additions and 2 deletions
.gitlab-ci.yml
+ 23
− 2
View file @ 9948ed98
.env: .env:
variables: variables:
GHC_VERSION_BUILD: "9.6.2" GHC_VERSION_BUILD: "9.4.7"
CABAL_VERSION_BUILD: "3.10.1.0" CABAL_VERSION_BUILD: "3.8.1.0"
STACK_VERSION: "2.11.1" STACK_VERSION: "2.11.1"
HLS_VERSION: "2.2.0.0" HLS_VERSION: "2.2.0.0"
BUILD_GHC: "true" BUILD_GHC: "true"
...@@ -223,6 +223,13 @@ build-manifest:version-linux-multiarch: ...@@ -223,6 +223,13 @@ build-manifest:version-linux-multiarch:
$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
fi fi
docker manifest push $CI_APP_REPO:$CI_APP_TAG 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: rules:
- if: $BUILD_GHC == "true" && $CI_COMMIT_BRANCH == "freeze-version" - if: $BUILD_GHC == "true" && $CI_COMMIT_BRANCH == "freeze-version"
changes: changes:
...@@ -373,6 +380,13 @@ build-package-hls-manifest:version-linux-multiarch: ...@@ -373,6 +380,13 @@ build-package-hls-manifest:version-linux-multiarch:
$CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-arm64v8 $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-arm64v8
fi fi
docker manifest push $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION 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: rules:
- if: $BUILD_HLS == "true" && $CI_COMMIT_BRANCH == "freeze-version" - if: $BUILD_HLS == "true" && $CI_COMMIT_BRANCH == "freeze-version"
changes: changes:
...@@ -512,5 +526,12 @@ update-manifest:version-linux-multiarch: ...@@ -512,5 +526,12 @@ update-manifest:version-linux-multiarch:
$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
fi fi
docker manifest push $CI_APP_REPO:$CI_APP_TAG 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: rules:
- if: $UPDATE_STACK == "true" && $CI_COMMIT_BRANCH == "freeze-version" - if: $UPDATE_STACK == "true" && $CI_COMMIT_BRANCH == "freeze-version"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment