From 5d35a740b2fd70b225aaa94541ff22c3ed3e060a Mon Sep 17 00:00:00 2001 From: wz1000 Date: Wed, 14 Sep 2022 13:44:32 +0530 Subject: [PATCH] Release script fixes (#3154) --- release/fetch_gitlab.py | 5 +++-- release/upload.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/release/fetch_gitlab.py b/release/fetch_gitlab.py index 1232e26d6..7aa18c952 100644 --- a/release/fetch_gitlab.py +++ b/release/fetch_gitlab.py @@ -41,13 +41,14 @@ def fetch_artifacts(release: str, pipeline_id: int, logging.info(f'artifact archive for job {job.name} (job {job.id}) is empty') continue - dest = dest_dir / f'haskell-language-server-{release}-{platform}.tar.xz' + extension = 'zip' if job.name.endswith('windows') else 'tar.xz' + dest = dest_dir / f'haskell-language-server-{release}-{platform}.{extension}' if dest.exists(): logging.info(f'bindist {dest} already exists') continue subprocess.run(['unzip', '-bo', zip_name, '-d', destdir]) - bindist_files = list(destdir.glob('*/haskell-language-server*.tar.xz')) + bindist_files = list(destdir.glob(f'*/haskell-language-server*.{extension}')) if len(bindist_files) == 0: logging.warn(f'Bindist does not exist') continue diff --git a/release/upload.sh b/release/upload.sh index c83eaaa95..29f684975 100755 --- a/release/upload.sh +++ b/release/upload.sh @@ -35,7 +35,7 @@ fi echo HLS version $ver -host="webhost.haskell.org" +host="gitlab-storage.haskell.org" usage() { echo "Usage: [rel_name=] SIGNING_KEY= $0 "