Skip to content

Commit 16ef746

Browse files
committed
ci: docker-publish CI のビルド時間を大幅短縮
arm64クロスコンパイル(QEMUエミュレーション)を廃止し、 amd64のみのビルドに変更することでCI実行時間を削減する。 QEMUによるarm64ビルドは実ビルドの5〜10倍以上の時間を要していた。 Dockerfile.simulatorcliも合わせて最適化: - ビルドステージ: 不要なQt5パッケージを削除(simulator-cliはQt6のみ使用) - ランタイムステージ: devパッケージをランタイムライブラリのみに置換 - qt6-base-dev, libqt6opengl6-dev → libqt6core6t64, libqt6gui6t64等 - libprotobuf-dev → libprotobuf32t64
1 parent fac9f1d commit 16ef746

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

‎.github/workflows/docker-publish.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ jobs:
3434
with:
3535
submodules: recursive
3636

37-
- name: Set up QEMU
38-
uses: docker/setup-qemu-action@v3
39-
4037
- name: Set up Docker Buildx
4138
uses: docker/setup-buildx-action@v3
4239

@@ -67,7 +64,7 @@ jobs:
6764
with:
6865
context: .
6966
file: ./data/docker/Dockerfile.simulatorcli
70-
platforms: linux/amd64,linux/arm64
67+
platforms: linux/amd64
7168
push: ${{ github.event_name != 'pull_request' }}
7269
tags: ${{ steps.meta.outputs.tags }}
7370
labels: ${{ steps.meta.outputs.labels }}

‎data/docker/Dockerfile.simulatorcli‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ RUN set -xe; \
1010
apt-get install --no-install-recommends -y \
1111
cmake make g++ libssl-dev patch \
1212
protobuf-compiler libprotobuf-dev \
13-
qt6-base-dev libqt6opengl6-dev \
14-
qtbase5-dev libqt5opengl5-dev; \
13+
qt6-base-dev libqt6opengl6-dev; \
1514
apt-get clean -y; \
1615
rm -rf /var/lib/apt/lists/*;
1716

@@ -37,9 +36,8 @@ ARG DEBIAN_FRONTEND=noninteractive
3736
RUN set -xe; \
3837
apt-get update; \
3938
apt-get install --no-install-recommends -y \
40-
qt6-base-dev libqt6opengl6-dev \
41-
qtbase5-dev libqt5opengl5-dev \
42-
libprotobuf-dev tini; \
39+
libqt6core6t64 libqt6gui6t64 libqt6network6t64 libqt6opengl6t64 \
40+
libprotobuf32t64 tini; \
4341
apt-get clean -y; \
4442
rm -rf /var/lib/apt/lists/*;
4543

0 commit comments

Comments
 (0)