Remove remaining references to AppVeyor and let the build script dete…

…rmine the version suffix.
teo-tsirpanis · Nov 10, 2024 · 6e1182d · 6e1182d
1 parent b10bcab
commit 6e1182d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,9 +19,6 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 6.0.x
-      - name: Add nightly pack options
-        if: github.event_name != 'release'
-        run: echo "PackageVersionSuffix=nightly.${{ github.run_number }}" >> $GITHUB_ENV
       - name: Restore .NET local tools
         run: dotnet tool restore
       - name: Pack

diff --git a/eng/build.fs b/eng/build.fs
@@ -125,7 +125,7 @@ let releaseNotes =
             s <- sr.ReadLine()
     }
     match BuildServer.buildServer with
-    | AppVeyor ->
+    | GitHubActions ->
         let commitMessage = CommitMessage.getCommitMessage Environment.CurrentDirectory
         sprintf "This is a build from the commit with id: %s from branch %s/%s"
             GitHubActions.Environment.Sha
@@ -136,7 +136,7 @@ let releaseNotes =
 
 let nugetVersion =
     match BuildServer.buildServer with
-    AppVeyor -> sprintf "%s-ci.%s" releaseInfo.NugetVersion GitHubActions.Environment.RunNumber
+    GitHubActions -> sprintf "%s-ci.%s" releaseInfo.NugetVersion GitHubActions.Environment.RunNumber
     | _ -> releaseInfo.NugetVersion
 
 BuildServer.install [GitHubActions.Installer]

diff --git a/tests/Farkle.Tests/RegexTests.fs b/tests/Farkle.Tests/RegexTests.fs
@@ -80,8 +80,7 @@ let tests = testList "Regex tests" [
             |> Flip.Expect.wantOk "Generating a DFA for a literal string failed"
         Expect.hasLength dfa (str.Length + 1) "The DFA is not minimal")
 
-    // It fails on Windows when using NLS (including the AppVeyor CI which uses Windows Server).
-    ptest "Titlecase letters are correctly handled when building a case-insensitive DFA" {
+    test "Titlecase letters are correctly handled when building a case-insensitive DFA" {
         let term = Terminal(0u, "A") |> Choice1Of4
         let regex = Regex.char 'ǅ'
         let dfa =

diff --git a/tests/Farkle.Tools.MSBuild.Tests/Farkle.Tools.MSBuild.Tests.csproj b/tests/Farkle.Tools.MSBuild.Tests/Farkle.Tools.MSBuild.Tests.csproj
@@ -5,7 +5,7 @@
     There were problems with the roll-forward while testing
     with a local precompiler worker. -->
     <TargetFramework>net6.0</TargetFramework>
-    <VSTestLogger>Appveyor</VSTestLogger>
+    <VSTestLogger>GitHubActions</VSTestLogger>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <FarkleGenerateHtml>true</FarkleGenerateHtml>
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.34" />
   </ItemGroup>
 </Project>