Fix taring up

.gitlab-ci.yml

+stages:
+  - build
+  - tar
+
 # Used for ci setup in the gitlab mirror of the project:
 # https://gitlab.haskell.org/haskell/haskell-language-server/-/pipelines
 variables:
@@ -33,6 +37,7 @@ workflow:
     - when: never
 
 .build:
+  stage: build
   script:
     - bash .gitlab/ci.sh
   artifacts:
@@ -46,10 +51,20 @@ build-aarch64-linux-deb10:
     - aarch64-linux
   image: "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb10:$DOCKER_REV"
   parallel: *arm_matrix
+  variables:
+    ADD_CABAL_ARGS: ""
+
+tar-aarch64-linux-deb10:
+  stage: tar
+  needs: ["build-aarch64-linux-deb10"]
+  tags:
+    - aarch64-linux
+  image: "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb10:$DOCKER_REV"
+  script:
+    - ./.gitlab/tar.sh
   variables:
     TARBALL_ARCHIVE_SUFFIX: aarch64-linux-deb10
     TARBALL_EXT: tar.xz
-    ADD_CABAL_ARGS: ""
 
 build-armv7-linux-deb10:
   extends: .build
@@ -57,10 +72,20 @@ build-armv7-linux-deb10:
     - armv7-linux
   image: "registry.gitlab.haskell.org/ghc/ci-images/armv7-linux-deb10:$DOCKER_REV"
   parallel: *arm_matrix
+  variables:
+    ADD_CABAL_ARGS: ""
+
+tar-armv7-linux-deb10:
+  stage: tar
+  needs: ["build-armv7-linux-deb10"]
+  tags:
+    - armv7-linux
+  image: "registry.gitlab.haskell.org/ghc/ci-images/armv7-linux-deb10:$DOCKER_REV"
+  script:
+    - ./.gitlab/tar.sh
   variables:
     TARBALL_ARCHIVE_SUFFIX: armv7-linux-deb10
     TARBALL_EXT: tar.xz
-    ADD_CABAL_ARGS: ""
 
 build-x86_64-linux:
   extends: .build
@@ -69,10 +94,20 @@ build-x86_64-linux:
   image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
   parallel: *default_matrix
   variables:
-    TARBALL_ARCHIVE_SUFFIX: armv7-linux-deb10
-    TARBALL_EXT: tar.xz
     ADD_CABAL_ARGS: "--enable-split-sections"
 
+tar-x86_64-linux:
+  stage: tar
+  needs: ["build-x86_64-linux"]
+  tags:
+    - x86_64-linux
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
+  script:
+    - ./.gitlab/tar.sh
+  variables:
+    TARBALL_ARCHIVE_SUFFIX: x86_64-linux
+    TARBALL_EXT: tar.xz
+
 build-x86_64-linux-alpine:
   extends: .build
   tags:
@@ -81,20 +116,39 @@ build-x86_64-linux-alpine:
   before_script:
     - sudo apk add --no-cache zlib zlib-dev zlib-static bzip2 bzip2-dev bzip2-static gmp gmp-dev xz xz-dev ncurses-static
   parallel: *default_matrix
+  variables:
+    ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"
+
+tar-x86_64-linux-alpine:
+  stage: tar
+  needs: ["build-x86_64-linux-alpine"]
+  tags:
+    - x86_64-linux
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV"
+  script:
+    - ./.gitlab/tar.sh
   variables:
     TARBALL_ARCHIVE_SUFFIX: x86_64-linux-alpine
     TARBALL_EXT: tar.xz
-    ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"
 
 build-x86_64-freebsd12:
   extends: .build
   tags:
     - x86_64-freebsd12
   parallel: *default_matrix
+  variables:
+    ADD_CABAL_ARGS: "--enable-split-sections"
+
+tar-x86_64-freebsd12:
+  stage: tar
+  needs: ["build-x86_64-freebsd12"]
+  tags:
+    - x86_64-freebsd12
+  script:
+    - ./.gitlab/tar.sh
   variables:
     TARBALL_ARCHIVE_SUFFIX: x86_64-freebsd12
     TARBALL_EXT: tar.xz
-    ADD_CABAL_ARGS: "--enable-split-sections"
 
 build-x86_64-freebsd13:
   extends: .build
@@ -105,22 +159,41 @@ build-x86_64-freebsd13:
     - sudo pkg update
     - sudo pkg install --yes compat12x-amd64
     - sudo ln -s libncurses.so.6 /usr/local/lib/libncurses.so.6.2
+  variables:
+    ADD_CABAL_ARGS: "--enable-split-sections"
+
+tar-x86_64-freebsd13:
+  stage: tar
+  needs: ["build-x86_64-freebsd13"]
+  tags:
+    - x86_64-freebsd13
+  script:
+    - ./.gitlab/tar.sh
   variables:
     TARBALL_ARCHIVE_SUFFIX: x86_64-freebsd13
     TARBALL_EXT: tar.xz
-    ADD_CABAL_ARGS: "--enable-split-sections"
 
 build-x86_64-darwin:
   extends: .build
   tags:
     - x86_64-darwin
   parallel: *default_matrix
+  variables:
+    ADD_CABAL_ARGS: ""
+
+tar-x86_64-darwin:
+  stage: tar
+  needs: ["build-x86_64-darwin"]
+  tags:
+    - x86_64-darwin
+  script:
+    - ./.gitlab/tar.sh
   variables:
     TARBALL_ARCHIVE_SUFFIX: x86_64-darwin
     TARBALL_EXT: tar.xz
-    ADD_CABAL_ARGS: ""
 
 build-aarch64-darwin:
+  stage: build
   tags:
     - aarch64-darwin-m1
   before_script:
@@ -155,8 +228,6 @@ build-aarch64-darwin:
     - rm -Rf /private/tmp/.brew_tmp
   variables:
     MACOSX_DEPLOYMENT_TARGET: "10.7"
-    TARBALL_ARCHIVE_SUFFIX: aarch64-darwin
-    TARBALL_EXT: tar.xz
     ADD_CABAL_ARGS: ""
   parallel: *m1_matrix
   artifacts:
@@ -164,6 +235,17 @@ build-aarch64-darwin:
     paths:
       - out
 
+tar-aarch64-darwin:
+  stage: tar
+  needs: ["build-aarch64-darwin"]
+  tags:
+    - aarch64-darwin-m1
+  script:
+    - arch -arm64 /bin/bash ./.gitlab/tar.sh
+  variables:
+    TARBALL_ARCHIVE_SUFFIX: aarch64-darwin
+    TARBALL_EXT: tar.xz
+
 build-x86_64-windows:
   extends: .build
   tags:
@@ -172,8 +254,19 @@ build-x86_64-windows:
   script:
     - bash '-lc' 'pacman --noconfirm -S zip'
     - $env:CHERE_INVOKING = "yes"
-    - bash '-lc' "TARBALL_ARCHIVE_SUFFIX=$env:TARBALL_ARCHIVE_SUFFIX TARBALL_EXT=$env:TARBALL_EXT ADD_CABAL_ARGS=$env:ADD_CABAL_ARGS GHC_VERSION=$env:GHC_VERSION CABAL_INSTALL_VERSION=$CABAL_INSTALL_VERSION .gitlab/ci.sh"
+    - bash '-lc' "ADD_CABAL_ARGS=$env:ADD_CABAL_ARGS GHC_VERSION=$env:GHC_VERSION CABAL_INSTALL_VERSION=$CABAL_INSTALL_VERSION .gitlab/ci.sh"
+  variables:
+    ADD_CABAL_ARGS: ""
+
+tar-x86_64-windows:
+  stage: tar
+  needs: ["build-x86_64-windows"]
+  tags:
+    - new-x86_64-windows
+  script:
+    - $env:CHERE_INVOKING = "yes"
+    - bash '-lc' "TARBALL_ARCHIVE_SUFFIX=$env:TARBALL_ARCHIVE_SUFFIX TARBALL_EXT=$env:TARBALL_EXT .gitlab/tar.sh"
   variables:
     TARBALL_ARCHIVE_SUFFIX: x86_64-windows
     TARBALL_EXT: zip
-    ADD_CABAL_ARGS: ""
+

.gitlab/ci.sh

@@ -78,17 +78,3 @@ cp dist-newstyle/cache/plan.json "$CI_PROJECT_DIR/out/plan.json"
 
 cd "$CI_PROJECT_DIR/out/"
 
-# create tarball/zip
-TARBALL_PREFIX="haskell-language-server-$("$CI_PROJECT_DIR/out/haskell-language-server-${GHC_VERSION}" --numeric-version)"
-case "${TARBALL_EXT}" in
-    zip)
-        zip "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" haskell-language-server-${GHC_VERSION} haskell-language-server-wrapper plan.json
-        ;;
-    tar.xz)
-        tar caf "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" haskell-language-server-${GHC_VERSION} haskell-language-server-wrapper plan.json
-        ;;
-    *)
-        fail "Unknown TARBALL_EXT: ${TARBALL_EXT}"
-        ;;
-esac
-

.gitlab/tar.sh

+#!/usr/bin/env bash
+
+set -Eeuxo pipefail
+
+source "$CI_PROJECT_DIR/.gitlab/common.sh"
+
+ls -la out/
+
+
+# create tarball/zip
+TARBALL_PREFIX="haskell-language-server-$("$CI_PROJECT_DIR/out/haskell-language-server-wrapper" --numeric-version)"
+case "${TARBALL_EXT}" in
+    zip)
+        zip "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" haskell-language-server-*
+        ;;
+    tar.xz)
+        tar caf "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" haskell-language-server-*
+        ;;
+    *)
+        fail "Unknown TARBALL_EXT: ${TARBALL_EXT}"
+        ;;
+esac
+
+