Edit: extend time

jasonyang-ee · Feb 11, 2024 · dc64766 · dc64766
1 parent 243bc81
commit dc64766
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -23,7 +23,7 @@ jobs:
       contents: read
       packages: write
 
-    timeout-minutes: 600
+    timeout-minutes: 6000
 
     strategy:
       fail-fast: false

diff --git a/BuilderQt.sh b/BuilderQt.sh
@@ -49,7 +49,8 @@ fi
 # Build Qt Builder Image
 if [[ "$VERSION" = "6.6.1" ]] || [[ "$VERSION" = "6.5.3" ]]; then
 	echo "Compiling Qt Version $VERSION"
-	docker buildx build --target=artifact --output type=local,dest=$(pwd)/build-${VERSION}/ --platform linux/amd64,linux/arm64 -t qt-builder:latest --build-arg VERSION=${VERSION} --load ./BuilderQt
+	docker buildx build --target=artifact --output type=local,dest=$(pwd)/build-${VERSION}/ --platform linux/amd64,linux/arm64 --build-arg VERSION=${VERSION} ./BuilderQt
+	docker buildx build --target=building --push --platform linux/amd64,linux/arm64 -t jasonyangee/qt-builder:${VERSION} --build-arg VERSION=${VERSION} ./BuilderQt
 else
 	echo "Invalid Version"
 fi

diff --git a/BuilderQt/Dockerfile b/BuilderQt/Dockerfile
@@ -38,11 +38,18 @@ RUN apt-get -y update && apt-get install -y --no-install-recommends \
 	libxcb-xkb-dev \
 	libxkbcommon-dev \
 	libxkbcommon-x11-dev \
-	libclang-dev \
 	libgl1-mesa-dev \
+	libfontconfig1 \
+	libxkbcommon0 \
+	libgl1 \
+	libpng16-16 \
+	libfreetype6 \
+	libwayland-* \
+	python3-html5lib \
+	libclang-dev \
 	&& apt-get clean && apt-get autoremove && rm -rf /var/lib/apt/lists/*
 
-
+ENV LLVM_INSTALL_DIR="/usr/llvm"
 
 FROM qt-environment as download