Skip to content

Commit 186339f

Browse files
authored
fix: Nightly build (#779)
Rust can build with the latest nightly now (and the CI isn't building from source any more so it can't specify a commit any more) Doesn't fully fix the nightly build but will once dafny-lang/dafny#6090 is addressed.
1 parent 5fb3f25 commit 186339f

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

Diff for: .github/actions/build_dafny_from_source/action.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# TODO: Replace this with the setup-dafny-action version when it is working.
12
name: "Build Dafny from source"
23
description: "Builds the given branch of Dafny from source"
34
inputs:

Diff for: .github/workflows/nightly_dafny.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ jobs:
3131
if: github.event_name != 'schedule' || github.repository_owner == 'smithy-lang'
3232
uses: ./.github/workflows/test_models_rust_tests.yml
3333
with:
34-
# Rust currently depends on building Dafny from source,
35-
# so we can't rely on setup-dafny-action's support for "nightly-latest"
36-
# (until https://github.com/dafny-lang/setup-dafny-action/issues/24 is done at least)
37-
dafny: "master"
34+
dafny: "nightly-latest"
3835
dafny-nightly-python:
3936
if: github.event_name != 'schedule' || github.repository_owner == 'smithy-lang'
4037
uses: ./.github/workflows/test_models_python_tests.yml

Diff for: .github/workflows/pull.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
fail-fast: false
5252
matrix:
5353
# Rust code generation is under development and depends on pending changes to the
54-
# Dafny Rust code generation, so we test on a specific unreleased commit instead.
54+
# Dafny Rust code generation, so we test on a specific prerelease instead.
5555
dafny-version:
5656
- nightly-2025-01-30-7db1e5f
5757
uses: ./.github/workflows/test_models_rust_tests.yml

Diff for: SmithyDafnyMakefile.mk

+2
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,8 @@ _polymorph_dafny: INPUT_DAFNY=\
378378
--include-dafny $(PROJECT_ROOT)/$(STD_LIBRARY)/src/Index.dfy
379379
_polymorph_dafny: _polymorph
380380

381+
dafny: polymorph_dafny verify
382+
381383
# Generates dotnet code for all namespaces in this project
382384
.PHONY: polymorph_dotnet
383385
polymorph_dotnet: POLYMORPH_LANGUAGE_TARGET=dotnet

Diff for: TestModels/Constraints/test/Helpers.dfy

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module Helpers {
99
import opened Wrappers
1010

1111
// UTF-8 encoded "aws-kms"
12-
const PROVIDER_ID: UTF8.ValidUTF8Bytes :=
12+
const {:vcs_split_on_every_assert} PROVIDER_ID: UTF8.ValidUTF8Bytes :=
1313
var s := [0x61, 0x77, 0x73, 0x2D, 0x6B, 0x6D, 0x73];
1414
assert UTF8.ValidUTF8Range(s, 0, 7);
1515
s

Diff for: TestModels/Dependencies/test/SimpleDependenciesImplTest.dfy

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ module SimpleDependenciesImplTest {
1313
import SimpleResourcesTypes
1414
import opened Wrappers
1515

16+
1617
method{:test} TestDependenciesWithDefaultConfig()
1718
{
1819
var client :- expect SimpleDependencies.SimpleDependencies();

0 commit comments

Comments
 (0)