Skip to content

Commit

Permalink
fix bug of idle/freq bytes chart and update net8.0 (#57)
Browse files Browse the repository at this point in the history
Signed-off-by: catcherwong <[email protected]>
catcherwong authored Apr 28, 2024
1 parent cee47c6 commit 98925c8
Showing 12 changed files with 48 additions and 46 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
@@ -17,13 +17,13 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.0.x
8.0.x
6.0.x
- name: Show dotnet Version
@@ -35,6 +35,6 @@ jobs:
run: |
dotnet build rdb-tools.sln
- name: Run tests on net7.0
- name: Run tests on net8.0
run: |
dotnet test tests/RDBParserTests/RDBParserTests.csproj
23 changes: 12 additions & 11 deletions .github/workflows/release_stable_cli.yaml
Original file line number Diff line number Diff line change
@@ -20,19 +20,20 @@ jobs:
"linux-arm",
"linux-arm64",
"osx-x64",
"osx-arm64",
"win-x86",
"win-arm",
"win-x64",
"win-arm64"
]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup .NET SDK 7.0.x
uses: actions/setup-dotnet@v3
- name: Setup .NET SDK 8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Publish .NET app
env:
@@ -49,7 +50,7 @@ jobs:
ls /home/runner/work/clis/
zip -j /home/runner/work/release/rdb-cli.$VERSION.$RID.zip /home/runner/work/clis/$RID/*
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rdb-cli
path: /home/runner/work/release
@@ -66,12 +67,12 @@ jobs:
]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup .NET SDK 7.0.x
uses: actions/setup-dotnet@v3
- name: Setup .NET SDK 8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Publish .NET app
env:
@@ -89,7 +90,7 @@ jobs:
ls ../publish/
Compress-Archive -Path ../publish/$($env:RID)/* -DestinationPath ../release/rdb-cli.$($env:VERSION).$($env:RID).aot.zip
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rdb-cli
path: D:/a/rdb-tools/release
@@ -101,7 +102,7 @@ jobs:

steps:
- name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: rdb-cli
path: rdb-cli
12 changes: 6 additions & 6 deletions .github/workflows/release_stable_nuget.yaml
Original file line number Diff line number Diff line change
@@ -13,13 +13,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup .NET Core 7.0.x
uses: actions/setup-dotnet@v3
- name: Setup .NET Core 8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.0.x
8.0.x
6.0.x
- name: Build with dotnet
@@ -32,7 +32,7 @@ jobs:
dotnet pack src/RDBCli/RDBCli.csproj -o /home/runner/work/nugetpkgs -c Release --no-build
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nugetpkgs
path: /home/runner/work/nugetpkgs
@@ -44,7 +44,7 @@ jobs:

steps:
- name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: nugetpkgs
path: nugetpkgs
23 changes: 12 additions & 11 deletions .github/workflows/release_unstable_cli.yaml
Original file line number Diff line number Diff line change
@@ -19,19 +19,20 @@ jobs:
"linux-arm",
"linux-arm64",
"osx-x64",
"osx-arm64",
"win-x86",
"win-arm",
"win-x64",
"win-arm64"
]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup .NET SDK 7.0.x
uses: actions/setup-dotnet@v3
- name: Setup .NET SDK 8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Publish .NET app
env:
@@ -48,7 +49,7 @@ jobs:
ls /home/runner/work/clis/
zip -j /home/runner/work/release/rdb-cli.$VERSION.$RID.zip /home/runner/work/clis/$RID/*
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rdb-cli
path: /home/runner/work/release
@@ -65,12 +66,12 @@ jobs:
]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup .NET SDK 7.0.x
uses: actions/setup-dotnet@v3
- name: Setup .NET SDK 8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Publish .NET app
env:
@@ -88,7 +89,7 @@ jobs:
ls ../publish/
Compress-Archive -Path ../publish/$($env:RID)/* -DestinationPath ../release/rdb-cli.$($env:VERSION).$($env:RID).aot.zip
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rdb-cli
path: D:/a/rdb-tools/release
@@ -100,7 +101,7 @@ jobs:

steps:
- name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: rdb-cli
path: rdb-cli
12 changes: 6 additions & 6 deletions .github/workflows/release_unstable_nuget.yaml
Original file line number Diff line number Diff line change
@@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@4

- name: Setup .NET Core 7.0.x
uses: actions/setup-dotnet@v3
- name: Setup .NET Core 8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.0.x
8.0.x
6.0.x
- name: Build with dotnet
@@ -30,7 +30,7 @@ jobs:
dotnet pack src/RDBParser/RDBParser.csproj --version-suffix $ver -o /home/runner/work/nugetpkgs -c Release --no-build
dotnet pack src/RDBCli/RDBCli.csproj --version-suffix $ver -o /home/runner/work/nugetpkgs -c Release --no-build
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nugetpkgs
path: /home/runner/work/nugetpkgs
@@ -42,7 +42,7 @@ jobs:

steps:
- name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: nugetpkgs
path: nugetpkgs
2 changes: 1 addition & 1 deletion build/dependencies.props
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<PropertyGroup>
<!-- RDBCli -->
<SystemCommandLinePackageVersion>2.0.0-beta4.22272.1</SystemCommandLinePackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-*</MicrosoftDotNetILCompilerPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-*</MicrosoftDotNetILCompilerPackageVersion>

<!-- RDBParser -->
<MicrosoftSourceLinkGitHubPackageVersion>1.1.*</MicrosoftSourceLinkGitHubPackageVersion>
4 changes: 2 additions & 2 deletions build/version.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>

<RDBParserVersion>0.7.1</RDBParserVersion>
<RDBCliVersion>0.8.3</RDBCliVersion>
<RDBParserVersion>0.9.0</RDBParserVersion>
<RDBCliVersion>0.9.0</RDBCliVersion>

</PropertyGroup>
</Project>
Loading

0 comments on commit 98925c8

Please sign in to comment.