Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6ebb2ef
chore: Update Windows CI runners from windows-2019 to windows-2022
fabiomadge Jul 1, 2025
1401b68
chore: Remove unnecessary news entry
fabiomadge Jul 1, 2025
c176d72
chore: Update package.py to use windows-2022
fabiomadge Jul 1, 2025
a30e6f1
Apply suggestions from code review
fabiomadge Jul 1, 2025
ec3361c
Merge branch 'master' into chore/fix-windows-ci-targets
keyboardDrummer Jul 2, 2025
db44e2a
bump solver builds
fabiomadge Jul 2, 2025
4926db3
bump z3
fabiomadge Jul 2, 2025
ef9c746
fix urls
fabiomadge Jul 3, 2025
993caf7
Fixes windows targets
MikaelMayer Jul 3, 2025
3d07fc6
fix crash
fabiomadge Jul 3, 2025
2e96eb1
Debug code to investigate why it's not working.
MikaelMayer Jul 3, 2025
51b236f
Merge branch 'chore/fix-windows-ci-targets' of https://github.com/daf…
MikaelMayer Jul 3, 2025
cd39aed
Ensured test passes on Windows
MikaelMayer Jul 3, 2025
96ad34b
Merge branch 'master' into chore/fix-windows-ci-targets
fabiomadge Jul 4, 2025
80c6365
Merge branch 'master' into chore/fix-windows-ci-targets
fabiomadge Jul 4, 2025
5e668c0
Revert "Debug code to investigate why it's not working."
MikaelMayer Jul 7, 2025
5e5236b
Merge branch 'chore/fix-windows-ci-targets' of https://github.com/daf…
MikaelMayer Jul 7, 2025
472b222
Fix a crash on Windows and vscode-ide
MikaelMayer Jul 7, 2025
33352e9
Merge branch 'master' into chore/fix-windows-ci-targets
MikaelMayer Jul 7, 2025
82644b3
Trigger Build
fabiomadge Jul 8, 2025
bb68e36
Merge branch 'master' into chore/fix-windows-ci-targets
MikaelMayer Jul 8, 2025
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 .github/workflows/integration-tests-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ jobs:
- name: Populate OS list (all platforms)
id: populate-os-list-all
if: inputs.all_platforms
run: echo "os-list=[\"ubuntu-22.04\", \"macos-13\", \"windows-2019\"]" >> $GITHUB_OUTPUT
run: echo "os-list=[\"ubuntu-22.04\", \"macos-13\", \"windows-2022\"]" >> $GITHUB_OUTPUT
- name: Populate OS list (one platform)
id: populate-os-list-one
if: "!inputs.all_platforms"
run: echo "os-list=[\"ubuntu-22.04\"]" >> $GITHUB_OUTPUT
- name: Populate OS mapping for package.py
id: populate-os-mapping
run: |
echo "os-mapping={\"ubuntu-22.04\": \"ubuntu\", \"macos-13\": \"macos\", \"windows-2019\": \"windows\"}" >> $GITHUB_OUTPUT
echo "os-mapping={\"ubuntu-22.04\": \"ubuntu\", \"macos-13\": \"macos\", \"windows-2022\": \"windows\"}" >> $GITHUB_OUTPUT
- name: Populate target runtime version list (all platforms)
id: populate-target-runtime-version-all
if: inputs.all_platforms
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/release-downloads-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# This workflow breaks on windows-2022: https://github.com/dafny-lang/dafny/issues/1906
os: [ ubuntu-22.04, macos-13, windows-2019 ]
os: [ ubuntu-22.04, macos-13, windows-2022 ]

steps:
- name: OS
Expand Down Expand Up @@ -110,8 +109,7 @@ jobs:
# Hopefully we can automatically populate this list in the future,
# but note we need to skip Dafny since nuget install doesn't work for dotnet tools.
library-name: [ DafnyPipeline, DafnyServer, DafnyLanguageServer, DafnyRuntime, DafnyCore, DafnyDriver ]
# This workflow breaks on windows-2022: https://github.com/dafny-lang/dafny/issues/1906
os: [ ubuntu-latest, ubuntu-22.04, macos-13, windows-2019 ]
os: [ ubuntu-latest, ubuntu-22.04, macos-13, windows-2022 ]

steps:
# Verify that the dependencies of the libraries we publish (e.g. DafnyLanguageServer)
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/release-downloads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,16 @@ jobs:
strategy:
fail-fast: false
matrix:
# This workflow breaks on windows-2022: https://github.com/dafny-lang/dafny/issues/1906
os: [ ubuntu-latest, ubuntu-22.04, macos-13, windows-2019 ]
os: [ ubuntu-latest, ubuntu-22.04, macos-13, windows-2022 ]
include:
- os: 'ubuntu-latest'
osn: 'ubuntu-22.04'
- os: 'ubuntu-22.04'
osn: 'ubuntu-22.04'
- os: 'macos-13'
osn: 'x64-macos-13'
- os: 'windows-2019'
osn: 'windows-2019'
- os: 'windows-2022'
osn: 'windows-2022'
# There is no hosted environment for Ubuntu 14.04 or for debian

# Java is installed by default, but we need to select 18
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/xunit-tests-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, windows-2019, macos-13]
os: [ubuntu-22.04, windows-2022, macos-13]
iteration: ${{ fromJson(needs.populate-matrix-dimensions.outputs.iterations) }}
include:
- os: macos-13
suffix: osx
chmod: true
- os: windows-2019
- os: windows-2022
suffix: win
chmod: false
- os: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion Scripts/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ def main():
releases = [ Release("macos-11", "x64", args.version, args.out),
Release("macos-11", "arm64", args.version, args.out),
Release("ubuntu-20.04", "x64", args.version, args.out),
Release("windows-2019", "x64", args.version, args.out) ]
Release("windows-2022", "x64", args.version, args.out) ]
if args.os:
releases = list(filter(lambda release: release.os_name == args.os, releases))
if args.platform:
Expand Down
Loading