Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GA CI/CD script #3

Merged
merged 6 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/pr_validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,26 @@ jobs:
- name: "Install .NET SDK"
uses: actions/[email protected]
with:
global-json-file: "./global.json"
global-json-file: "./src/global.json"

- name: "Update release notes"
shell: pwsh
run: |
./build.ps1

- name: "dotnet build"
run: dotnet build -c Release
run: dotnet build -c Release ./src/Reactive.Streams.sln

# .NET Framework tests can't run reliably on Linux, so we only do .NET 6

- name: "dotnet test"
shell: bash
run: |
if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
dotnet test -c Release --framework net6.0
dotnet test -c Release --no-build --framework net6.0 ./src/Reactive.Streams.sln
else
dotnet test -c Release
dotnet test -c Release --no-build ./src/Reactive.Streams.sln
fi

- name: "dotnet pack"
run: dotnet pack -c Release
run: dotnet pack -c Release --no-build ./src/Reactive.Streams.sln
11 changes: 6 additions & 5 deletions .github/workflows/publish_nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v4

- name: "Install .NET SDK"
uses: actions/[email protected]
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
global-json-file: "./src/global.json"

- name: "Update release notes"
shell: pwsh
run: |
./build.ps1

- name: Create Packages
run: dotnet pack /p:PackageVersion=${{ github.ref_name }} -c Release -o ./output
run: dotnet pack /p:PackageVersion=${{ github.ref_name }} -c Release -o ./output ./src/Reactive.Streams.sln

- name: Push Packages
run: dotnet nuget push "output/*.nupkg" -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json
Expand All @@ -38,7 +39,7 @@ jobs:
with:
draft: false
prerelease: false
release_name: 'Akka.Analyzers ${{ github.ref_name }}'
release_name: 'Reactive.Streams ${{ github.ref_name }}'
tag_name: ${{ github.ref }}
body_path: RELEASE_NOTES.md
env:
Expand Down
2 changes: 1 addition & 1 deletion src/NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</packageSources>

<packageSourceMapping>
<packageSource key="nuget">
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
Expand Down
1 change: 1 addition & 0 deletions src/Reactive.Streams.sln
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{8511E402-A25A-48
..\Relicensing.txt = ..\Relicensing.txt
global.json = global.json
Directory.Generated.props = Directory.Generated.props
NuGet.Config = NuGet.Config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{A82A5E19-1495-4662-B684-DEFA107C42B4}"
Expand Down
2 changes: 1 addition & 1 deletion src/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestMinor",
"version": "6.0.31"
"version": "6.0.423"
}
}
Loading