Skip to content
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

On newer-lts branch: switch Windows to 64-bit builds #5188

Closed
wants to merge 1 commit into from
Closed

On newer-lts branch: switch Windows to 64-bit builds #5188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .azure/azure-nightly-template-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
export PATH=$PATH:"/C/Program Files/Mercurial/"
/tmp/cache-s3 --prefix="${CACHE_S3_PREFIX}" --git-branch="$(Build.SourceBranchName)" --suffix="${OS_NAME}" restore stack --base-branch="${BASE_BRANCH}"
/tmp/cache-s3 --prefix="${CACHE_S3_PREFIX}" --git-branch="$(Build.SourceBranchName)" --suffix="${OS_NAME}" restore stack work --base-branch="${BASE_BRANCH}"
curl -sSkL http://www.stackage.org/stack/windows-i386 -o /usr/bin/stack.zip
curl -sSkL http://www.stackage.org/stack/windows-x86_64 -o /usr/bin/stack.zip
unzip -o /usr/bin/stack.zip -d /usr/bin/
stack setup
stack --version
Expand All @@ -43,7 +43,7 @@ jobs:
- powershell: |
$env:STACK_ROOT = "$(Build.SourcesDirectory)\.stack-root"
$env:PATH += ";$env:HOME\.local\bin"
stack etc/scripts/release.hs --arch=i386 build
stack etc/scripts/release.hs --arch=x86_64 build
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This MR looks like it has the same issue as #5189 -- builds 64-bit release twice.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's actually better to simply close this PR in favor of #5189.

git clean -f
stack etc/scripts/release.hs --arch=x86_64 build
copy _release/stack-* $(Build.ArtifactStagingDirectory)
Expand Down
2 changes: 1 addition & 1 deletion .azure/azure-windows-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
# unzip -o /tmp/cache-s3.zip -d /usr/bin
/tmp/cache-s3 --prefix="${CACHE_S3_PREFIX}" --git-branch="$(Build.SourceBranchName)" --suffix="${OS_NAME}" restore stack --base-branch="${BASE_BRANCH}"
/tmp/cache-s3 --prefix="${CACHE_S3_PREFIX}" --git-branch="$(Build.SourceBranchName)" --suffix="${OS_NAME}" restore stack work --base-branch="${BASE_BRANCH}"
curl -sSkL http://www.stackage.org/stack/windows-i386 -o /usr/bin/stack.zip
curl -sSkL http://www.stackage.org/stack/windows-x86_64 -o /usr/bin/stack.zip
unzip -o /usr/bin/stack.zip -d /usr/bin/
stack setup
stack test --jobs 1
Expand Down