Skip to content

Commit

Permalink
Merge pull request #3871 from planetarium/fix/push-docker-image-error
Browse files Browse the repository at this point in the history
Fix CI errors
  • Loading branch information
s2quake committed Jul 10, 2024
2 parents 33817bc + b8b8b11 commit 56333a0
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks-merged.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
with:
dotnet-version: 6.0.x
- name: Run benchmark
run: dotnet run -p Libplanet.Benchmarks -c Release -- --exporters json --filter '*'
run: dotnet run --project tools/Libplanet.Benchmarks -c Release -- --exporters json --filter '*'

- name: Store benchmark result
uses: planetarium/github-action-benchmark@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
with:
dotnet-version: 6.0.x
- run: 'hooks/pre-commit'
- run: 'dotnet build -p:SkipSonar=false'
- run: 'dotnet pack -p:SkipSonar=false'
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ In order to track performance improvements or regressions, we maintain a set of
benchmarks and continuously measure them in the CI. You can run benchmarks
on your local environment too:

dotnet run -p Libplanet.Benchmarks -c Release -- -j short -f "*"
dotnet run --project tools/Libplanet.Benchmarks -c Release -- -j short -f "*"

Note that there is `-j short`; without this a whole set of benchmarks takes
quite a long time. This will print like below:
Expand All @@ -367,7 +367,7 @@ quite a long time. This will print like below:

You can measure only part of benchmarks by `-f`/`--filter`ing them:

dotnet run -p Libplanet.Benchmarks -c Release -- -j short -f "*MineBlock*"
dotnet run --project tools/Libplanet.Benchmarks -c Release -- -j short-f "*MineBlock*"

All benchmark code is placed under *Libplanet.Benchmarks* project.
As our benchmarks are based on [BenchmarkDotNet], please read their official
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile.explorer
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ WORKDIR /app

# Copy csproj and restore as distinct layers
# Note that it's ordered by the least frequently changed
COPY ./Directory.Build.props ./
COPY ./src/Directory.Build.props ./src/
COPY ./tools/Directory.Build.props ./tools/
COPY ./src/Libplanet.Stun/Libplanet.Stun.csproj ./src/Libplanet.Stun/
RUN dotnet restore src/Libplanet.Stun
COPY ./src/Libplanet.RocksDBStore/Libplanet.RocksDBStore.csproj ./src/Libplanet.RocksDBStore/
Expand Down
4 changes: 2 additions & 2 deletions tools/Libplanet.Explorer/run.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if ($args.Length -lt 1) {
$stderr.Invoke("Try ``run.ps1 --help' for more information.")
exit 1
} elseif ($args.Contains("--help") -or $args.Contains("-h")) {
dotnet run -p . -- @args
dotnet run --project . -- @args
exit $?
}
dotnet watch -p . -- run -- @args
dotnet watch --project . -- run -- @args

0 comments on commit 56333a0

Please sign in to comment.