Skip to content

Commit db36646

Browse files
authored
Fix broken example tester workflow on draft-v8, and make tools runnable out of the box (#1336)
* MSBuildLocator is no longer required when using Roslyn 4.9+ (and it's failing on my machine) * Add launchsettings files matching the shell scripts * Roslyn v4.14 no longer reports a second CS1661 error at the same location where there is also a CS1678 error (https://github.com/dotnet/roslyn/pull/75400/files#r1866802220) * Trigger examples test workflow when the impl code changes * Only run workflows when things change that could affect them * Fix typo
1 parent 3b3e35a commit db36646

File tree

16 files changed

+69
-20
lines changed

16 files changed

+69
-20
lines changed

.github/workflows/do-not-merge-label-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
- name: 'Check "${{ matrix.label }}" label'
3030
run: |
31-
echo "::notice::Merging permission is diabled for PRs when the '${{ matrix.label }}' label is applied."
31+
echo "::notice::Merging permission is disabled for PRs when the '${{ matrix.label }}' label is applied."
3232
3333
if [ "${{ contains(github.event.pull_request.labels.*.name, matrix.label) }}" = "true" ]; then
3434
echo "::error::Pull request is labeled as '${{ matrix.label }}'. Please remove the label before merging."

.github/workflows/grammar-validator.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ name: ANTLR Grammar validator
44
on:
55
pull_request:
66
types: [opened, synchronize, reopened]
7+
paths:
8+
- "standard/**"
9+
- "tools/GrammarTesting/**"
10+
- "tools/validate-grammar.sh"
11+
- ".github/workflows/dependencies/GrammarTestingEnv.tgz"
712
workflow_dispatch:
813
inputs:
914
reason:

.github/workflows/renumber-sections.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ name: Renumber standard TOC
44
on:
55
pull_request:
66
types: [opened, synchronize, reopened]
7+
paths:
8+
- "standard/**"
9+
- "tools/StandardAnchorTags/**"
10+
- "tools/run-section-renumber.sh"
711
workflow_dispatch:
812
inputs:
913
reason:

.github/workflows/test-examples.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ on:
66
types: [opened, synchronize, reopened]
77
paths:
88
- "standard/*.md"
9+
- "tools/example-templates/**"
10+
- "tools/ExampleExtractor/**"
11+
- "tools/ExampleTester/**"
12+
- "tools/Utilities/**"
13+
- "tools/test-examples.sh"
914
workflow_dispatch:
1015
inputs:
1116
reason:

.github/workflows/tools-tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
pull_request:
66
types: [opened, synchronize, reopened]
77
paths:
8-
- '**.cs'
9-
- '**.csproj'
10-
- '**.sln'
8+
- 'tools/**.cs'
9+
- 'tools/**.csproj'
10+
- 'tools/**.sln'
1111
workflow_dispatch:
1212
inputs:
1313
reason:

.github/workflows/word-converter.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ name: Word Converter
44
on:
55
pull_request:
66
types: [opened, synchronize, reopened]
7+
paths:
8+
- "standard/**"
9+
- "tools/MarkdownConverter/**"
10+
- "tools/run-converter.sh"
711
workflow_dispatch:
812
inputs:
913
reason:

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,3 @@ test-grammar/
360360

361361
# don't checkin jar files:
362362
*.jar
363-
364-
# don't checkin launchSettings:
365-
**/launchSettings.json

standard/conversions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ Specifically, an anonymous function `F` is compatible with a delegate type `D`
767767
768768
> *Example*: The following examples illustrate these rules:
769769
>
770-
> <!-- Example: {template:"code-in-class-lib-without-using", name:"AnonymousFunctionsConv1", expectedErrors:["CS1593","CS1661","CS1678","CS8030","CS1688","CS1661","CS1676","CS1643","CS0126","CS0029","CS1662","CS1670","CS0029","CS1662"]} -->
770+
> <!-- Example: {template:"code-in-class-lib-without-using", name:"AnonymousFunctionsConv1", expectedErrors:["CS1593","CS1661","CS1678","CS8030","CS1688","CS1676","CS1643","CS0126","CS0029","CS1662","CS1670","CS0029","CS1662"]} -->
771771
> ```csharp
772772
> delegate void D(int x);
773773
> D d1 = delegate { }; // Ok
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"profiles": {
3+
"ExampleExtractor": {
4+
"commandName": "Project",
5+
"commandLineArgs": "../standard example-templates tmp",
6+
"workingDirectory": "$(SolutionDir)"
7+
}
8+
}
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"profiles": {
3+
"ExampleFormatter": {
4+
"commandName": "Project",
5+
"commandLineArgs": "../standard",
6+
"workingDirectory": "$(SolutionDir)"
7+
}
8+
}
9+
}

0 commit comments

Comments
 (0)