diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73a9d50c18..13d2c88ef8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,11 @@ workflow: - x86_64-linux image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV" +.x86_64-linux-fedora27: + tags: + - x86_64-linux + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV" + .x86_64-linux-alpine: tags: - x86_64-linux @@ -300,6 +305,52 @@ test-x86_64-linux-fedora33: before_script: - sudo dnf install -y tree +###################### +# x86_64 linux unknown +###################### + +build-x86_64-linux-unknown: + extends: + - .build + - .x86_64-linux-fedora27 + before_script: | + echo "NAME=Linux" > ~/os-release.fake + echo "ID=linux" >> ~/os-release.fake + echo "PRETTY_NAME=Linux" >> ~/os-release.fake + sudo ln -sf /home/ghc/os-release.fake /etc/os-release + sudo dnf install -y patchelf tree + variables: + ADD_CABAL_ARGS: "--enable-split-sections" + +tar-x86_64-linux-unknown: + extends: + - .artifacts + - .x86_64-linux-fedora27 + stage: tar + needs: ["build-x86_64-linux-unknown"] + before_script: | + echo "NAME=Linux" > ~/os-release.fake + echo "ID=linux" >> ~/os-release.fake + echo "PRETTY_NAME=Linux" >> ~/os-release.fake + sudo ln -sf /home/ghc/os-release.fake /etc/os-release + script: + - ./.gitlab/tar.sh + variables: + TARBALL_ARCHIVE_SUFFIX: x86_64-unknown-linux + TARBALL_EXT: tar.xz + +test-x86_64-linux-unknown: + extends: + - .test + - .x86_64-linux-fedora27 + needs: ["tar-x86_64-linux-unknown"] + before_script: | + echo "NAME=Linux" > ~/os-release.fake + echo "ID=linux" >> ~/os-release.fake + echo "PRETTY_NAME=Linux" >> ~/os-release.fake + sudo ln -sf /home/ghc/os-release.fake /etc/os-release + sudo dnf install -y tree + ###################### # x86_64 linux alpine diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 751b09c7ea..fa321668a6 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -80,6 +80,7 @@ case "$(uname)" in cp "$(cabal list-bin -v0 ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/haskell-language-server-wrapper"$EXE_EXTENSION ;; *) + ghcup debug-info sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project emake --version emake GHCUP=ghcup hls