Skip to content

Commit 06cbf7c

Browse files
committed
Removed --ci-build parameter and added auto-selection
1 parent 7cbc9fd commit 06cbf7c

File tree

5 files changed

+17
-20
lines changed

5 files changed

+17
-20
lines changed

.github/workflows/publish_ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,68 +54,68 @@ jobs:
5454
run: dotnet tool restore
5555

5656
- name: Run integration tests
57-
run: dotnet run --project build/Build.fsproj -- --embed-all --ci-build
57+
run: dotnet run --project build/Build.fsproj -- --embed-all
5858

5959
- name: Pack FSharp.Data.GraphQL.Shared project
6060
run: |
6161
cd src/FSharp.Data.GraphQL.Shared
62-
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=Embedded -o ../../nuget
62+
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=embedded -o ../../nuget
6363
- name: Publish FSharp.Data.GraphQL.Shared package to GitHub
6464
run: |
6565
dotnet nuget push nuget/FSharp.Data.GraphQL.Shared.${{env.VERSION}}.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate
6666
6767
- name: Pack FSharp.Data.GraphQL.Client project
6868
run: |
6969
cd src/FSharp.Data.GraphQL.Client
70-
dotnet pack --configuration Release /p:IsNuGet=true /p:DebugType=Embedded -o ../../nuget
70+
dotnet pack --configuration Release /p:IsNuGet=true /p:DebugType=embedded -o ../../nuget
7171
- name: Publish FSharp.Data.GraphQL.Client package to GitHub
7272
run: |
7373
dotnet nuget push nuget/FSharp.Data.GraphQL.Client.${{env.VERSION}}.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate
7474
7575
- name: Pack FSharp.Data.GraphQL.Server project
7676
run: |
7777
cd src/FSharp.Data.GraphQL.Server
78-
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=Embedded -o ../../nuget
78+
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=embedded -o ../../nuget
7979
- name: Publish FSharp.Data.GraphQL.Server package to GitHub
8080
run: |
8181
dotnet nuget push nuget/FSharp.Data.GraphQL.Server.${{env.VERSION}}.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate
8282
8383
- name: Pack FSharp.Data.GraphQL.Server.AspNetCore project
8484
run: |
8585
cd src/FSharp.Data.GraphQL.Server.AspNetCore
86-
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=Embedded -o ../../nuget
86+
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=embedded -o ../../nuget
8787
- name: Publish FSharp.Data.GraphQL.Server.AspNetCore package to GitHub
8888
run: |
8989
dotnet nuget push nuget/FSharp.Data.GraphQL.Server.AspNetCore.${{env.VERSION}}.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate
9090
9191
- name: Pack FSharp.Data.GraphQL.Server.Giraffe project
9292
run: |
9393
cd src/FSharp.Data.GraphQL.Server.Giraffe
94-
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=Embedded -o ../../nuget
94+
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=embedded -o ../../nuget
9595
- name: Publish FSharp.Data.GraphQL.Server.Giraffe package to GitHub
9696
run: |
9797
dotnet nuget push nuget/FSharp.Data.GraphQL.Server.Giraffe.${{env.VERSION}}.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate
9898
9999
- name: Pack FSharp.Data.GraphQL.Server.Oxpecker project
100100
run: |
101101
cd src/FSharp.Data.GraphQL.Server.Oxpecker
102-
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=Embedded -o ../../nuget
102+
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=embedded -o ../../nuget
103103
- name: Publish FSharp.Data.GraphQL.Server.Oxpecker package to GitHub
104104
run: |
105105
dotnet nuget push nuget/FSharp.Data.GraphQL.Server.Oxpecker.${{env.VERSION}}.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate
106106
107107
- name: Pack FSharp.Data.GraphQL.Server.Relay project
108108
run: |
109109
cd src/FSharp.Data.GraphQL.Server.Relay
110-
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=Embedded -o ../../nuget
110+
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=embedded -o ../../nuget
111111
- name: Publish FSharp.Data.GraphQL.Server.Relay package to GitHub
112112
run: |
113113
dotnet nuget push nuget/FSharp.Data.GraphQL.Server.Relay.${{env.VERSION}}.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate
114114
115115
- name: Pack FSharp.Data.GraphQL.Server.Middleware project
116116
run: |
117117
cd src/FSharp.Data.GraphQL.Server.Middleware
118-
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=Embedded -o ../../nuget
118+
dotnet pack --no-build --configuration Release /p:IsNuGet=true /p:DebugType=embedded -o ../../nuget
119119
- name: Publish FSharp.Data.GraphQL.Server.Middleware package to GitHub
120120
run: |
121121
dotnet nuget push nuget/FSharp.Data.GraphQL.Server.Middleware.${{env.VERSION}}.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate

.github/workflows/publish_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: dotnet tool restore
5555

5656
- name: Run integration tests
57-
run: dotnet run --project build/Build.fsproj -- --ci-build
57+
run: dotnet run --project build/Build.fsproj
5858

5959
- name: Pack FSharp.Data.GraphQL.Shared project
6060
run: |

Directory.Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3333
</PropertyGroup>
3434

35+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
36+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
37+
</PropertyGroup>
38+
3539
<ItemGroup>
3640
<None Include="$(RepoRoot)\icon.png" Pack="true" PackagePath="\" />
3741
<None Include="$(RepoRoot)\README.md" Pack="true" PackagePath="\" />

Packages.props

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@
4747
<PackageReference Update="FSharp.Compiler.Service" Version="43.7.300" />
4848
<PackageReference Update="Mono.Posix.NETStandard" Version="1.0.0" />
4949
<PackageReference Update="MSBuild.StructuredLogger" Version="2.*" />
50-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
51-
<PrivateAssets>all</PrivateAssets>
52-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
53-
</PackageReference>
50+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
5451
</ItemGroup>
5552
<ItemGroup Label="Test platform">
5653
<PackageReference Update="BenchmarkDotNet" Version="0.14.*" />

build/Program.fs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@ execContext
2626

2727
module BuildArguments =
2828
let [<Literal>] EmbedAll = "--embed-all"
29-
let [<Literal>] CIBuild = "--ci-build"
3029
let [<Literal>] SkipDuplicate = "--skip-duplicate"
3130

3231
let ctx = Context.forceFakeContext ()
3332
let embedAll = ctx.Arguments |> List.exists (fun arg -> arg = BuildArguments.EmbedAll)
34-
let ciBuild = ctx.Arguments |> List.exists (fun arg -> arg = BuildArguments.CIBuild)
3533

3634
module DotNetCli =
3735
let setVersion (o : DotNet.Options) = { o with Version = Some "8.0.403" }
@@ -85,10 +83,8 @@ Target.create BuildTarget <| fun _ ->
8583
DisableInternalBinLog = true
8684
Properties = [
8785
if embedAll then
88-
("DebugType", "Embedded")
86+
("DebugType", "embedded")
8987
("EmbedAllSources", "true")
90-
if ciBuild then
91-
("ContinuousIntegrationBuild", "true")
9288
]
9389
}
9490
})
@@ -271,7 +267,7 @@ let pack id =
271267
options.MSBuildParams with
272268
Properties = [
273269
if embedAll then
274-
("DebugType", "Embedded")
270+
("DebugType", "embedded")
275271
("IsNuget", "true")
276272
]
277273
}

0 commit comments

Comments
 (0)