Merge pull request #2644 from planetarium/release/220

Release 220
planetarium · Nov 27, 2024 · 08308b1 · 08308b1
2 parents 7d0e233 + 2cac22a
commit 08308b1
Show file tree

Hide file tree

Showing 24 changed files with 217 additions and 383 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,3 +4,8 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"
diff --git a/.github/workflows/deploy_gh_pages.yaml b/.github/workflows/deploy_gh_pages.yaml
@@ -67,7 +67,7 @@ jobs:
       - name: Copy GraphQL Schema to deploy
         run: cp schema.graphql public/schema.graphql
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./public
diff --git a/.github/workflows/push_docker_image.yml b/.github/workflows/push_docker_image.yml
@@ -43,33 +43,22 @@ jobs:
           docker login \
             --username '${{ secrets.DOCKER_USERNAME }}' \
             --password '${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}'
-      - name: setup-qemu
-        run: |
-          docker run --rm --privileged multiarch/qemu-user-static \
-            --reset \
-            -p yes
-      - name: build-and-push-amd64
-        run: |
-          docker build . \
-            -f ${{ matrix.docker.dockerfile }}.amd64 \
-            -t ${{ matrix.docker.repo }}:git-${{ github.sha }}-amd64 \
-            --build-arg COMMIT=git-${{ github.sha }} \
-            --build-arg TARGETPLATFORM=linux/amd64
-          docker push ${{ matrix.docker.repo }}:git-${{ github.sha }}-amd64
-      - name: build-and-push-arm64v8
-        run: |
-          docker build . \
-            -f ${{ matrix.docker.dockerfile }}.arm64v8 \
-            -t ${{ matrix.docker.repo }}:git-${{ github.sha }}-arm64v8 \
-            --build-arg COMMIT=git-${{ github.sha }} \
-            --build-arg TARGETPLATFORM=linux/arm64
-          docker push ${{ matrix.docker.repo }}:git-${{ github.sha }}-arm64v8
-      - name: merge-manifest-and-push
-        run: |
-          docker manifest create ${{ matrix.docker.repo }}:git-${{ github.sha }} \
-            --amend ${{ matrix.docker.repo }}:git-${{ github.sha }}-amd64 \
-            --amend ${{ matrix.docker.repo }}:git-${{ github.sha }}-arm64v8
-          docker manifest push ${{ matrix.docker.repo }}:git-${{ github.sha }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+            platforms: linux/arm/v8,linux/amd64
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+            push: ${{ github.event_name != 'pull_request' }}
+            platforms: linux/arm64,linux/amd64
+            tags: ${{ matrix.docker.repo }}:git-${{ github.sha }}
+            file: ${{ matrix.docker.dockerfile }}
+            build-args: COMMIT=git-${{ github.sha }}
+        env:
+            BUILDKIT_PROGRESS: 'plain'
 
   tag:
     name: tag (${{ matrix.docker.repo }})
@@ -87,23 +76,14 @@ jobs:
             --password '${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}'
       - name: push git tagged version
         run: |
-          docker pull ${{ matrix.docker.repo }}:git-${{ github.sha }}-amd64
+          docker pull ${{ matrix.docker.repo }}:git-${{ github.sha }}
           if [[ -z "${{ github.event.inputs.imageTag }}" ]]; then
             export IMAGE_TAG=${{ github.ref_name }}
           else
             export IMAGE_TAG=${{ github.event.inputs.imageTag }}
           fi
 
           docker tag \
-            ${{ matrix.docker.repo }}:git-${{ github.sha }}-amd64 \
-            ${{ matrix.docker.repo }}:$IMAGE_TAG-amd64
-          docker push ${{ matrix.docker.repo }}:$IMAGE_TAG-amd64
-          docker pull ${{ matrix.docker.repo }}:git-${{ github.sha }}-arm64v8
-          docker tag \
-            ${{ matrix.docker.repo }}:git-${{ github.sha }}-arm64v8 \
-            ${{ matrix.docker.repo }}:$IMAGE_TAG-arm64v8
-          docker push ${{ matrix.docker.repo }}:$IMAGE_TAG-arm64v8
-          docker manifest create ${{ matrix.docker.repo }}:$IMAGE_TAG \
-            --amend ${{ matrix.docker.repo }}:$IMAGE_TAG-amd64 \
-            --amend ${{ matrix.docker.repo }}:$IMAGE_TAG-arm64v8
-          docker manifest push ${{ matrix.docker.repo }}:$IMAGE_TAG
+            ${{ matrix.docker.repo }}:git-${{ github.sha }} \
+            ${{ matrix.docker.repo }}:$IMAGE_TAG
+          docker push ${{ matrix.docker.repo }}:$IMAGE_TAG
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+    <PropertyGroup>
+        <LibplanetVersion>5.4.1</LibplanetVersion>
+    </PropertyGroup>
+</Project>
diff --git a/Dockerfile b/Dockerfile
@@ -1,20 +1,8 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 ARG COMMIT
 ARG TARGETPLATFORM
 
-# Copy csproj and restore as distinct layers
-COPY ./Lib9c/Lib9c/Lib9c.csproj ./Lib9c/
-COPY ./Libplanet.Headless/Libplanet.Headless.csproj ./Libplanet.Headless/
-COPY ./NineChronicles.RPC.Shared/NineChronicles.RPC.Shared/NineChronicles.RPC.Shared.csproj ./NineChronicles.RPC.Shared/
-COPY ./NineChronicles.Headless/NineChronicles.Headless.csproj ./NineChronicles.Headless/
-COPY ./NineChronicles.Headless.Executable/NineChronicles.Headless.Executable.csproj ./NineChronicles.Headless.Executable/
-RUN dotnet restore Lib9c
-RUN dotnet restore Libplanet.Headless
-RUN dotnet restore NineChronicles.RPC.Shared
-RUN dotnet restore NineChronicles.Headless
-RUN dotnet restore NineChronicles.Headless.Executable
-
 # Copy everything else and build
 COPY . ./
 RUN <<EOF
@@ -43,7 +31,7 @@ fi
 EOF
 
 # Build runtime image
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim
 WORKDIR /app
 COPY --from=build-env /app/out .
 

diff --git a/Dockerfile.ACC b/Dockerfile.ACC
@@ -1,17 +1,9 @@
 # Use the SDK image to build the app
-FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 ARG COMMIT
 ARG TARGETPLATFORM
 
-# Copy csproj and restore as distinct layers
-COPY ./Lib9c/Lib9c/Lib9c.csproj ./Lib9c/
-COPY ./NineChronicles.Headless/NineChronicles.Headless.csproj ./NineChronicles.Headless/
-COPY ./NineChronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj ./NineChronicles.Headless.AccessControlCenter/
-RUN dotnet restore Lib9c
-RUN dotnet restore NineChronicles.Headless
-RUN dotnet restore NineChronicles.Headless.AccessControlCenter
-
 # Copy everything else and build
 COPY . ./
 RUN <<EOF
@@ -40,7 +32,7 @@ fi
 EOF
 
 # Build runtime image
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim
 WORKDIR /app
 RUN apt-get update && apt-get install -y libc6-dev
 COPY --from=build-env /app/out .

diff --git a/Lib9c b/Lib9c
diff --git a/...s.ForkableActionEvaluator.Tests/Libplanet.Extensions.ForkableActionEvaluator.Tests.csproj b/...s.ForkableActionEvaluator.Tests/Libplanet.Extensions.ForkableActionEvaluator.Tests.csproj
@@ -20,10 +20,9 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\Libplanet.Extensions.ForkableActionEvaluator\Libplanet.Extensions.ForkableActionEvaluator.csproj" />
-    <ProjectReference Include="..\Lib9c\.Libplanet.Extensions.ActionEvaluatorCommonComponents\Libplanet.Extensions.ActionEvaluatorCommonComponents.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...et.Extensions.ForkableActionEvaluator/Libplanet.Extensions.ForkableActionEvaluator.csproj b/...et.Extensions.ForkableActionEvaluator/Libplanet.Extensions.ForkableActionEvaluator.csproj
@@ -5,9 +5,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <ProjectReference Include="..\Lib9c\.Libplanet\src\Libplanet\Libplanet.csproj" />
+    <PackageReference Include="Libplanet.Action" Version="$(LibplanetVersion)" />
   </ItemGroup>
-
 </Project>
diff --git a/...anet.Extensions.PluggedActionEvaluator/Libplanet.Extensions.PluggedActionEvaluator.csproj b/...anet.Extensions.PluggedActionEvaluator/Libplanet.Extensions.PluggedActionEvaluator.csproj
@@ -7,9 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Lib9c\.Libplanet\src\Libplanet\Libplanet.csproj" />
     <ProjectReference Include="..\Lib9c\.Lib9c.Plugin.Shared\Lib9c.Plugin.Shared.csproj" />
     <ProjectReference Include="..\Lib9c\.Libplanet.Extensions.ActionEvaluatorCommonComponents\Libplanet.Extensions.ActionEvaluatorCommonComponents.csproj" />
   </ItemGroup>
-
+
+  <ItemGroup>
+    <PackageReference Include="Libplanet.Action" Version="$(LibplanetVersion)" />
+  </ItemGroup>
+
 </Project>
diff --git a/Libplanet.Headless/Libplanet.Headless.csproj b/Libplanet.Headless/Libplanet.Headless.csproj
@@ -7,6 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Libplanet.Explorer" Version="$(LibplanetVersion)" />
+    <PackageReference Include="Libplanet.Net" Version="$(LibplanetVersion)" />
+    <PackageReference Include="Libplanet.RocksDBStore" Version="$(LibplanetVersion)" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.1" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="8.49.0.57237">
       <PrivateAssets>all</PrivateAssets>
@@ -19,9 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Lib9c\.Libplanet\src\Libplanet\Libplanet.csproj" />
-    <ProjectReference Include="..\Lib9c\.Libplanet\src\Libplanet.RocksDBStore\Libplanet.RocksDBStore.csproj" />
-    <ProjectReference Include="..\Lib9c\.Libplanet\src\Libplanet.Net\Libplanet.Net.csproj" />
     <ProjectReference Include="..\NineChronicles.RPC.Shared\NineChronicles.RPC.Shared\NineChronicles.RPC.Shared.csproj" />
     <ProjectReference Include="..\Libplanet.Extensions.ForkableActionEvaluator\Libplanet.Extensions.ForkableActionEvaluator.csproj" />
     <ProjectReference Include="..\Libplanet.Extensions.PluggedActionEvaluator\Libplanet.Extensions.PluggedActionEvaluator.csproj" />

diff --git a/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj b/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj
@@ -26,7 +26,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\NineChronicles.Headless.Executable\NineChronicles.Headless.Executable.csproj" />
-        <ProjectReference Include="..\Lib9c\.Libplanet\test\Libplanet.Mocks\Libplanet.Mocks.csproj" />
     </ItemGroup>
 
 </Project>