Skip to content

Commit

Permalink
Merge pull request #439 from fsprojects/Fix_artifacts_path
Browse files Browse the repository at this point in the history
Fix artifact paths
  • Loading branch information
gdziadkiewicz authored Jan 7, 2025
2 parents 3467440 + e212a72 commit b2b6526
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
8 changes: 5 additions & 3 deletions build/build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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
// --------------------------------------------------------------------------------------
Expand Down Expand Up @@ -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"

}))
Expand All @@ -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 })
)


Expand Down

0 comments on commit b2b6526

Please sign in to comment.