Skip to content

Commit 21edc4b

Browse files
committed
Add 7z compress
1 parent 1df73aa commit 21edc4b

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
GHC_VER: ${{ matrix.ghc }}
5757
run: |
5858
echo "EXE_EXT=.exe" >> $GITHUB_ENV
59+
# We normalize windows+choco ghc version 8.10.2.2
5960
GHC_VER=$(echo $GHC_VER | sed 's/8.10.2.2/8.10.2/g')
6061
echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV
6162
@@ -74,7 +75,7 @@ jobs:
7475
run: |
7576
echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV
7677
77-
- name: Tentative Workaround for GHC 8.10.5 on macOS
78+
- name: Workaround for GHC 8.10.5 on macOS
7879
if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
7980
run: |
8081
echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
@@ -89,7 +90,6 @@ jobs:
8990
- name: Compress Server Binary
9091
id: compress_server_binary
9192
run: |
92-
# We normalize windows+choco ghc version 8.10.2.2
9393
HLS_BUILD=$(find dist-newstyle \( -name 'hls' -o -name 'hls.exe' \) -type f)
9494
HLS=haskell-language-server-${{env.GHC_VERSION}}
9595
mv $HLS_BUILD $HLS${{env.EXE_EXT}}
@@ -173,12 +173,21 @@ jobs:
173173

174174
- run: |
175175
# move the binaries for the specific platform into bin/
176+
COMPRESSEXT=gz
177+
if [[ "$OSTYPE" == "msys" ]]; then
178+
COMPRESSEXT=zip
179+
fi
176180
mkdir bin
177-
mv haskell-language-server-${{ matrix.os }}-*.gz/haskell-language-server-*.gz bin
178-
mv haskell-language-server-wrapper-${{ matrix.os }}.gz/haskell-language-server-wrapper.gz bin
181+
mv haskell-language-server-${{ matrix.os }}-*.$COMPRESSEXT/haskell-language-server-*.$COMPRESSEXT bin
182+
mv haskell-language-server-wrapper-${{ matrix.os }}.$COMPRESSEXT/haskell-language-server-wrapper.$COMPRESSEXT bin
179183
# decompress them
180-
gzip -d bin/*.gz
181184
cd bin
185+
if [[ "$OSTYPE" == "msys" ]]; then
186+
7z x "*.zip"
187+
rm *.zip
188+
else
189+
gzip -d *.gz
190+
fi
182191
tar -czpf haskell-language-server.tar.gz *
183192
184193
- uses: actions/upload-release-asset@v1.0.2

0 commit comments

Comments
 (0)