Skip to content

Commit

Permalink
Merge pull request #253 from planetarium/rc-v200210
Browse files Browse the repository at this point in the history
Merge build error fixed version
  • Loading branch information
area363 authored Sep 25, 2024
2 parents 45205b5 + cbda4a6 commit 96c1475
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 16 deletions.
1 change: 1 addition & 0 deletions .github/workflows/push_docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- rc*

env:
DOCKER_REPO: planetariumhq/ninechronicles-snapshot
Expand Down
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
WORKDIR /app
ARG COMMIT

COPY ./libplanet/Libplanet/Libplanet.csproj ./Libplanet/
COPY ./libplanet/Libplanet.RocksDBStore/Libplanet.RocksDBStore.csproj ./Libplanet.RocksDBStore/
COPY ./libplanet/Directory.Build.props ./
COPY ./libplanet/Menees.Analyzers.Settings.xml ./
COPY ./libplanet/stylecop.json ./
COPY ./libplanet/src/Directory.Build.props ./src/
COPY ./libplanet/src/Libplanet/Libplanet.csproj ./Libplanet/
COPY ./libplanet/src/Libplanet.RocksDBStore/Libplanet.RocksDBStore.csproj ./Libplanet.RocksDBStore/
COPY ./NineChronicles.Snapshot/NineChronicles.Snapshot.csproj ./NineChronicles.Snapshot/
RUN dotnet restore Libplanet
RUN dotnet restore Libplanet.RocksDBStore
Expand Down
8 changes: 6 additions & 2 deletions Dockerfile.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
WORKDIR /app
ARG COMMIT

COPY ./libplanet/Libplanet/Libplanet.csproj ./Libplanet/
COPY ./libplanet/Libplanet.RocksDBStore/Libplanet.RocksDBStore.csproj ./Libplanet.RocksDBStore/
COPY ./libplanet/Directory.Build.props ./
COPY ./libplanet/Menees.Analyzers.Settings.xml ./
COPY ./libplanet/stylecop.json ./
COPY ./libplanet/src/Directory.Build.props ./src/
COPY ./libplanet/src/Libplanet/Libplanet.csproj ./Libplanet/
COPY ./libplanet/src/Libplanet.RocksDBStore/Libplanet.RocksDBStore.csproj ./Libplanet.RocksDBStore/
COPY ./NineChronicles.Snapshot/NineChronicles.Snapshot.csproj ./NineChronicles.Snapshot/
RUN dotnet restore Libplanet
RUN dotnet restore Libplanet.RocksDBStore
Expand Down
8 changes: 6 additions & 2 deletions Dockerfile.arm64v8
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
WORKDIR /app
ARG COMMIT

COPY ./libplanet/Libplanet/Libplanet.csproj ./Libplanet/
COPY ./libplanet/Libplanet.RocksDBStore/Libplanet.RocksDBStore.csproj ./Libplanet.RocksDBStore/
COPY ./libplanet/Directory.Build.props ./
COPY ./libplanet/Menees.Analyzers.Settings.xml ./
COPY ./libplanet/stylecop.json ./
COPY ./libplanet/src/Directory.Build.props ./src/
COPY ./libplanet/src/Libplanet/Libplanet.csproj ./Libplanet/
COPY ./libplanet/src/Libplanet.RocksDBStore/Libplanet.RocksDBStore.csproj ./Libplanet.RocksDBStore/
COPY ./NineChronicles.Snapshot/NineChronicles.Snapshot.csproj ./NineChronicles.Snapshot/
RUN dotnet restore Libplanet
RUN dotnet restore Libplanet.RocksDBStore
Expand Down
14 changes: 7 additions & 7 deletions NineChronicles.Snapshot.sln
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NineChronicles.Snapshot", "NineChronicles.Snapshot\NineChronicles.Snapshot.csproj", "{C37DC105-FF05-47B4-9C2A-256072E8057C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet", "libplanet\Libplanet\Libplanet.csproj", "{91BB5A59-40B3-4028-BA11-A14ECB419938}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet", "libplanet\src\Libplanet\Libplanet.csproj", "{91BB5A59-40B3-4028-BA11-A14ECB419938}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.RocksDBStore", "libplanet\Libplanet.RocksDBStore\Libplanet.RocksDBStore.csproj", "{A87BF80A-6B59-4E13-9330-826394294DFA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.RocksDBStore", "libplanet\src\Libplanet.RocksDBStore\Libplanet.RocksDBStore.csproj", "{A87BF80A-6B59-4E13-9330-826394294DFA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Action", "libplanet\Libplanet.Action\Libplanet.Action.csproj", "{70D0513D-55C0-4A6B-8186-3F8C5E7C6D65}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Action", "libplanet\src\Libplanet.Action\Libplanet.Action.csproj", "{70D0513D-55C0-4A6B-8186-3F8C5E7C6D65}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Common", "libplanet\Libplanet.Common\Libplanet.Common.csproj", "{3422BA20-1571-4CCC-ABD1-E3FBEB77A7B2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Common", "libplanet\src\Libplanet.Common\Libplanet.Common.csproj", "{3422BA20-1571-4CCC-ABD1-E3FBEB77A7B2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Crypto", "libplanet\Libplanet.Crypto\Libplanet.Crypto.csproj", "{B22E9ECE-6B02-4D34-B504-DBB17E700983}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Crypto", "libplanet\src\Libplanet.Crypto\Libplanet.Crypto.csproj", "{B22E9ECE-6B02-4D34-B504-DBB17E700983}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Types", "libplanet\Libplanet.Types\Libplanet.Types.csproj", "{49CC98D6-8B5C-4CB9-8CC7-F50582D59B9F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Types", "libplanet\src\Libplanet.Types\Libplanet.Types.csproj", "{49CC98D6-8B5C-4CB9-8CC7-F50582D59B9F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Store", "libplanet\Libplanet.Store\Libplanet.Store.csproj", "{9BD055DB-8523-4D86-BE1B-F67CEF537EBF}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Store", "libplanet\src\Libplanet.Store\Libplanet.Store.csproj", "{9BD055DB-8523-4D86-BE1B-F67CEF537EBF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
4 changes: 2 additions & 2 deletions NineChronicles.Snapshot/NineChronicles.Snapshot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\libplanet\Libplanet\Libplanet.csproj" />
<ProjectReference Include="..\libplanet\Libplanet.RocksDBStore\Libplanet.RocksDBStore.csproj" />
<ProjectReference Include="..\libplanet\src\Libplanet\Libplanet.csproj" />
<ProjectReference Include="..\libplanet\src\Libplanet.RocksDBStore\Libplanet.RocksDBStore.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion libplanet
Submodule libplanet updated 951 files

0 comments on commit 96c1475

Please sign in to comment.