Skip to content

Commit 5d35a74

Browse files
authored
Release script fixes (#3154)
1 parent ddb21a0 commit 5d35a74

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Diff for: release/fetch_gitlab.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ def fetch_artifacts(release: str, pipeline_id: int,
4141
logging.info(f'artifact archive for job {job.name} (job {job.id}) is empty')
4242
continue
4343

44-
dest = dest_dir / f'haskell-language-server-{release}-{platform}.tar.xz'
44+
extension = 'zip' if job.name.endswith('windows') else 'tar.xz'
45+
dest = dest_dir / f'haskell-language-server-{release}-{platform}.{extension}'
4546
if dest.exists():
4647
logging.info(f'bindist {dest} already exists')
4748
continue
4849

4950
subprocess.run(['unzip', '-bo', zip_name, '-d', destdir])
50-
bindist_files = list(destdir.glob('*/haskell-language-server*.tar.xz'))
51+
bindist_files = list(destdir.glob(f'*/haskell-language-server*.{extension}'))
5152
if len(bindist_files) == 0:
5253
logging.warn(f'Bindist does not exist')
5354
continue

Diff for: release/upload.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fi
3535

3636
echo HLS version $ver
3737

38-
host="webhost.haskell.org"
38+
host="gitlab-storage.haskell.org"
3939

4040
usage() {
4141
echo "Usage: [rel_name=<name>] SIGNING_KEY=<key> $0 <action>"

0 commit comments

Comments
 (0)