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

Rename branch master to main

parent 88952927
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 4
− 4
View file @ a4613e1c
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
fi fi
- | - |
export CI_APP_REPO=${CI_APP_REPO:-$CI_REGISTRY_IMAGE} export CI_APP_REPO=${CI_APP_REPO:-$CI_REGISTRY_IMAGE}
if [[ $CI_COMMIT_BRANCH == "master" ]]; then if [[ $CI_COMMIT_BRANCH == "main" ]]; then
export CI_APP_TAG=${CI_APP_TAG:-latest} export CI_APP_TAG=${CI_APP_TAG:-latest}
elif [[ $CI_COMMIT_BRANCH == "freeze-version" ]]; then elif [[ $CI_COMMIT_BRANCH == "freeze-version" ]]; then
export CI_APP_TAG=${CI_APP_TAG:-$GHC_VERSION_BUILD} export CI_APP_TAG=${CI_APP_TAG:-$GHC_VERSION_BUILD}
...@@ -55,7 +55,7 @@ build:latest-linux-amd64: ...@@ -55,7 +55,7 @@ build:latest-linux-amd64:
docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64 docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64
docker push $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-amd64 docker push $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-amd64
rules: rules:
- if: $CI_COMMIT_BRANCH == "master" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/ - if: $CI_COMMIT_BRANCH == "main" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
changes: changes:
- latest.Dockerfile - latest.Dockerfile
...@@ -76,7 +76,7 @@ build:latest-linux-arm64v8: ...@@ -76,7 +76,7 @@ build:latest-linux-arm64v8:
docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
docker push $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-arm64v8 docker push $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-arm64v8
rules: rules:
- if: $CI_COMMIT_BRANCH == "master" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/ - if: $CI_COMMIT_BRANCH == "main" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
changes: changes:
- latest.Dockerfile - latest.Dockerfile
...@@ -149,7 +149,7 @@ build-manifest:latest-linux-multiarch: ...@@ -149,7 +149,7 @@ build-manifest:latest-linux-multiarch:
fi fi
docker manifest push $CI_APP_REPO:$VERSION_MAJ docker manifest push $CI_APP_REPO:$VERSION_MAJ
rules: rules:
- if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH == "main"
changes: changes:
- latest.Dockerfile - latest.Dockerfile
......
bootstrap/arm64.Dockerfile
+ 2
− 2
View file @ a4613e1c
...@@ -26,7 +26,7 @@ RUN apk add --update --no-cache \ ...@@ -26,7 +26,7 @@ RUN apk add --update --no-cache \
zlib-dev zlib-dev
RUN cd /tmp/ \ RUN cd /tmp/ \
&& wget https://gitlab.b-data.ch/ghc/ghc-bootstrap-aarch64/-/raw/master/ghc-8.8.3-r0.apk \ && wget https://gitlab.b-data.ch/ghc/ghc-bootstrap-aarch64/-/raw/main/ghc-8.8.3-r0.apk \
&& apk add --allow-untrusted ghc-8.8.3-r0.apk \ && apk add --allow-untrusted ghc-8.8.3-r0.apk \
&& curl -sSLO https://downloads.haskell.org/~cabal/cabal-install-$CABAL_VERSION/cabal-install-$CABAL_VERSION.tar.gz \ && curl -sSLO https://downloads.haskell.org/~cabal/cabal-install-$CABAL_VERSION/cabal-install-$CABAL_VERSION.tar.gz \
&& tar zxf cabal-install-$CABAL_VERSION.tar.gz \ && tar zxf cabal-install-$CABAL_VERSION.tar.gz \
...@@ -74,7 +74,7 @@ RUN apk add --update --no-cache \ ...@@ -74,7 +74,7 @@ RUN apk add --update --no-cache \
zlib-dev \ zlib-dev \
#zlib-static \ #zlib-static \
&& cd /tmp/ \ && cd /tmp/ \
&& wget https://gitlab.b-data.ch/ghc/ghc-bootstrap-aarch64/-/raw/master/ghc-8.8.3-r0.apk \ && wget https://gitlab.b-data.ch/ghc/ghc-bootstrap-aarch64/-/raw/main/ghc-8.8.3-r0.apk \
&& apk add --allow-untrusted ghc-8.8.3-r0.apk \ && apk add --allow-untrusted ghc-8.8.3-r0.apk \
&& cd / \ && cd / \
&& rm -rf /tmp/* && rm -rf /tmp/*
......
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