diff --git a/.github/workflows/push_docker_image.yml b/.github/workflows/push_docker_image.yml index 9e52a92..aff44ed 100644 --- a/.github/workflows/push_docker_image.yml +++ b/.github/workflows/push_docker_image.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - rc* env: DOCKER_REPO: planetariumhq/ninechronicles-snapshot diff --git a/Dockerfile b/Dockerfile index b4446ae..9a54e3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index b4446ae..9a54e3c 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -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 diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index c9a7eb5..4958cc9 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -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 diff --git a/NineChronicles.Snapshot.sln b/NineChronicles.Snapshot.sln index 36c71cc..b337e98 100644 --- a/NineChronicles.Snapshot.sln +++ b/NineChronicles.Snapshot.sln @@ -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 diff --git a/NineChronicles.Snapshot/NineChronicles.Snapshot.csproj b/NineChronicles.Snapshot/NineChronicles.Snapshot.csproj index eedceff..c221789 100644 --- a/NineChronicles.Snapshot/NineChronicles.Snapshot.csproj +++ b/NineChronicles.Snapshot/NineChronicles.Snapshot.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/libplanet b/libplanet index 0d400bc..4aadf2c 160000 --- a/libplanet +++ b/libplanet @@ -1 +1 @@ -Subproject commit 0d400bc7958ab39576ac40edb6563289d452b22e +Subproject commit 4aadf2c9919f93a283ec0f9883089a3dfd56f36c