Skip to content

release script fixes #2861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 28, 2022
Merged

release script fixes #2861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57004e9
gitlab-ci: Fix executable extension on windows
wz1000 Apr 27, 2022
eac10c0
Also recognize gz files in upload script
wz1000 Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitlab/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ source "$CI_PROJECT_DIR/.gitlab/common.sh"

export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR/toolchain"
export CABAL_DIR="$CI_PROJECT_DIR/cabal"
EXE_EXTENSION = ""

case "$(uname)" in
MSYS_*|MINGW*)
export CABAL_DIR="$(cygpath -w "$CABAL_DIR")"
GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin"
EXE_EXTENSION=".exe"
;;
*)
GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin"
Expand Down Expand Up @@ -74,8 +76,8 @@ case "$(uname)" in

mkdir "$CI_PROJECT_DIR/out"

cp "$(cabal list-bin ${args[@]} exe:hls)" "$CI_PROJECT_DIR/out/haskell-language-server-${GHC_VERSION}"
cp "$(cabal list-bin ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/haskell-language-server-wrapper"
cp "$(cabal list-bin ${args[@]} exe:hls)" "$CI_PROJECT_DIR/out/haskell-language-server-${GHC_VERSION}"$EXE_EXTENSION
cp "$(cabal list-bin ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/haskell-language-server-wrapper"$EXE_EXTENSION
;;
*)
emake --version
Expand Down
4 changes: 2 additions & 2 deletions release/upload.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ fi
function hash_files() {
echo $(find -maxdepth 1 \
-iname '*.xz' \
-o -iname '*.gz' \
-o -iname '*.lz' \
-o -iname '*.bz2' \
-o -iname '*.zip' \
)
echo $(find -maxdepth 1 -iname '*.patch')
Expand Down Expand Up @@ -120,7 +120,7 @@ function upload() {
open -u hls-downloads: sftp://$host && \
mirror -P20 -c --reverse --exclude=fetch-gitlab --exclude=out . hls/$dir && \
wait all;"
chmod ugo-w $(ls *.xz *.bz2 *.zip)
chmod ugo-w $(ls *.xz *.gz *.zip)
}

function purge_all() {
Expand Down