Skip to content

Commit b2b6526

Browse files
Merge pull request #439 from fsprojects/Fix_artifacts_path
Fix artifact paths
2 parents 3467440 + e212a72 commit b2b6526

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [ubuntu-latest, windows-latest, macOS-13]
20+
os: [ubuntu-22.04, windows-latest, macOS-13]
2121
runs-on: ${{ matrix.os }}
2222

2323
steps:
@@ -34,6 +34,7 @@ jobs:
3434
run: ./build.sh
3535
shell: bash
3636
- name: Save nuget package as artifact
37+
if: matrix.os == 'windows-latest'
3738
uses: actions/upload-artifact@v4
3839
with:
3940
name: nuget-package

build/build.fs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ let gitName = "FSharpx.Extras"
5353
// The url for the raw files hosted
5454
let gitRaw = Environment.environVarOrDefault "gitRaw" "https://raw.githubusercontent.com/fsprojects"
5555

56+
let outputDir = __SOURCE_DIRECTORY__ @@ "../bin"
57+
5658
// --------------------------------------------------------------------------------------
5759
// END TODO: The rest of the file includes standard build steps
5860
// --------------------------------------------------------------------------------------
@@ -102,7 +104,7 @@ let initTargets () =
102104
]
103105
|> Seq.iter (DotNet.publish (fun p ->
104106
{ p with
105-
OutputPath=Some(__SOURCE_DIRECTORY__ @@ "bin")
107+
OutputPath=Some outputDir
106108
Framework=Some"netstandard2.0"
107109

108110
}))
@@ -126,12 +128,12 @@ let initTargets () =
126128
Target.create "NuGet" (fun _ ->
127129
solutionFile
128130
|> DotNet.pack (fun p ->
129-
{ p with OutputPath=Some(__SOURCE_DIRECTORY__ @@ "bin") })
131+
{ p with OutputPath=Some outputDir })
130132
)
131133

132134
Target.create "PublishNuget" (fun _ ->
133135
Paket.push(fun p ->
134-
{ p with WorkingDir=__SOURCE_DIRECTORY__ @@ "bin" })
136+
{ p with WorkingDir= outputDir })
135137
)
136138

137139

0 commit comments

Comments
 (0)