Skip to content

Commit

Permalink
Merge branch 'master' into fix-compound-reference
Browse files Browse the repository at this point in the history
* master: (27 commits)
  Revert "Plugin unhandled exception (neo-project#3349)" (neo-project#3366)
  `[Move]` Part-2 Classes into Different Library - `Neo.IO` (neo-project#3388)
  [Neo Core Store] Rename various snapshots. (neo-project#3406)
  [Neo Core Storage] Implicit methods and tests (neo-project#3403)
  [Neo Core MemoryStore] MemoryStore Unit Tests. (neo-project#3404)
  Fixed Publish Step (neo-project#3411)
  Fix release compilation (neo-project#3417)
  [Neo Plugin UT] Rpcserver unit test on node (neo-project#3353)
  Improve code coverage (neo-project#3354)
  `[Add]` Debug Output to `Expect` (neo-project#3407)
  [Neo Plugin Store] Unit test (neo-project#3399)
  Bump System.Text.Json from 8.0.3 to 8.0.4 in /src/Neo.Json (neo-project#3416)
  `[Typo]` Unit Tests - UT_ProtocolSettings.CreateHKSettings (neo-project#3383)
  `[Fix]` Test Problems (neo-project#3398)
  Part-1 `Neo.IO` - move (neo-project#3387)
  Fixed Props Pathing for `dotnet pack` with `nuget` (neo-project#3379)
  `[neo-cli]` Error Message and Warning - LevelDb (neo-project#3380)
  Fix crash when comparing ContractPermissionDescriptor (neo-project#3396)
  `DeprecatedIn` for events (neo-project#3362)
  Fix download tips (neo-project#3395)
  ...
  • Loading branch information
Jim8y committed Jul 18, 2024
2 parents d59521c + f307a31 commit a28ec0b
Show file tree
Hide file tree
Showing 134 changed files with 3,390 additions and 1,084 deletions.
23 changes: 10 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Check Format (*.cs)
run: dotnet format --verify-no-changes --verbosity diagnostic

Build-Test-Neo-Cli:
Test-Everything:
needs: [Format]
timeout-minutes: 15
runs-on: ubuntu-latest
Expand All @@ -37,16 +37,16 @@ jobs:
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Build (Neo.CLI)
run: dotnet build ./src/Neo.CLI --output ./out/Neo.CLI
- name: Build (Everything)
run: dotnet build

- name: Install dependencies
run: |
sudo apt-get install libleveldb-dev expect
find ./out -name 'config.json' | xargs perl -pi -e 's|LevelDBStore|MemoryStore|g'
find ./bin -name 'config.json' | xargs perl -pi -e 's|LevelDBStore|MemoryStore|g'
- name: Run tests with expect
run: expect ./scripts/Neo.CLI/test-neo-cli.expect
run: expect ./scripts/Neo.CLI/test-neo-cli.exp

Test:
needs: [Format]
Expand All @@ -68,7 +68,8 @@ jobs:
if: matrix.os != 'ubuntu-latest'
run: |
dotnet sln neo.sln remove ./tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj
dotnet test
dotnet build
dotnet test --blame-hang --blame-crash --no-build
- name: Test for coverall
if: matrix.os == 'ubuntu-latest'
Expand All @@ -80,6 +81,7 @@ jobs:
dotnet test ./tests/Neo.UnitTests --output ./bin/tests/Neo.UnitTests
dotnet test ./tests/Neo.VM.Tests --output ./bin/tests/Neo.VM.Tests
dotnet test ./tests/Neo.Json.UnitTests --output ./bin/tests/Neo.Json.UnitTests
dotnet test ./tests/Neo.Extensions.Tests --output ./bin/tests/Neo.Extensions.Tests
# Plugins
dotnet test ./tests/Neo.Cryptography.MPTTrie.Tests --output ./bin/tests/Neo.Cryptography.MPTTrie.Tests
Expand All @@ -104,6 +106,7 @@ jobs:
${{ github.workspace }}/tests/Neo.Plugins.OracleService.Tests/TestResults/coverage.info
${{ github.workspace }}/tests/Neo.Plugins.RpcServer.Tests/TestResults/coverage.info
${{ github.workspace }}/tests/Neo.Plugins.Storage.Tests/TestResults/coverage.info
${{ github.workspace }}/tests/Neo.Extensions.Tests/TestResults/coverage.info

PublishPackage:
if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/')
Expand All @@ -123,19 +126,13 @@ jobs:
- name: Set Version
run: git rev-list --count HEAD | xargs printf 'CI%05d' | xargs -I{} echo 'VERSION_SUFFIX={}' >> $GITHUB_ENV

- name : Pack (Neo)
- name : Pack (Everything)
run: |
dotnet pack \
--configuration Release \
--output ./out \
--version-suffix ${{ env.VERSION_SUFFIX }}
- name: Remove Unwanted Files
working-directory: ./out
run: |
rm -v Neo.CLI*
rm -v Neo.GUI*
- name: Publish to Github Packages
working-directory: ./out
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
dotnet pack ./neo.sln \
--configuration Release \
--output ./sbin \
--verbosity normal \ # Normal verbosity level
-p:VersionPrefix=${{ env.APP_VERSION }} # Set the version prefix from tag_name
--verbosity normal \
-p:VersionPrefix=${{ env.APP_VERSION }}
- name: Publish to NuGet.org
run: |
Expand Down
Loading

0 comments on commit a28ec0b

Please sign in to comment.