diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2823cff5..2aefd69a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macOS-13] + os: [ubuntu-22.04, windows-latest, macOS-13] runs-on: ${{ matrix.os }} steps: @@ -34,6 +34,7 @@ jobs: run: ./build.sh shell: bash - name: Save nuget package as artifact + if: matrix.os == 'windows-latest' uses: actions/upload-artifact@v4 with: name: nuget-package diff --git a/build/build.fs b/build/build.fs index 05e9bc94..c1407123 100644 --- a/build/build.fs +++ b/build/build.fs @@ -53,6 +53,8 @@ let gitName = "FSharpx.Extras" // The url for the raw files hosted let gitRaw = Environment.environVarOrDefault "gitRaw" "https://raw.githubusercontent.com/fsprojects" +let outputDir = __SOURCE_DIRECTORY__ @@ "../bin" + // -------------------------------------------------------------------------------------- // END TODO: The rest of the file includes standard build steps // -------------------------------------------------------------------------------------- @@ -102,7 +104,7 @@ let initTargets () = ] |> Seq.iter (DotNet.publish (fun p -> { p with - OutputPath=Some(__SOURCE_DIRECTORY__ @@ "bin") + OutputPath=Some outputDir Framework=Some"netstandard2.0" })) @@ -126,12 +128,12 @@ let initTargets () = Target.create "NuGet" (fun _ -> solutionFile |> DotNet.pack (fun p -> - { p with OutputPath=Some(__SOURCE_DIRECTORY__ @@ "bin") }) + { p with OutputPath=Some outputDir }) ) Target.create "PublishNuget" (fun _ -> Paket.push(fun p -> - { p with WorkingDir=__SOURCE_DIRECTORY__ @@ "bin" }) + { p with WorkingDir= outputDir }) )