Skip to content

Commit

Permalink
bugfix: Fix one invocation after conflicts in a PR
Browse files Browse the repository at this point in the history
  • Loading branch information
tgodzik committed Feb 17, 2025
1 parent 852f99c commit c901ca7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ jobs:
WORKFLOW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
with:
filename: .github/workflows/issue_nightly_failed.md

build-sdk-package:
uses: ./.github/workflows/build-sdk.yml
if:
(github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]')) ||
Expand Down
3 changes: 1 addition & 2 deletions compiler/src/dotty/tools/dotc/typer/Typer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2501,8 +2501,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
case rhs => typedExpr(rhs, tpt1.tpe.widenExpr)
}
val vdef1 = assignType(cpy.ValDef(vdef)(name, tpt1, rhs1), sym)
postProcessInfo(sym)
vdef1.setDefTree
postProcessInfo(vdef1, sym)
}

private def retractDefDef(sym: Symbol)(using Context): Tree =
Expand Down

0 comments on commit c901ca7

Please sign in to comment.