From 7124cde42551de95cde15329d93146de5dedb541 Mon Sep 17 00:00:00 2001 From: x-tools-author Date: Fri, 25 Apr 2025 23:20:26 +0800 Subject: [PATCH] chore: do nothing --- .github/workflows/build-docker-windows.yml | 30 ++++++++-------------- docker/win-ltsc2022/Dockerfile | 3 ++- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-docker-windows.yml b/.github/workflows/build-docker-windows.yml index b198a406..7d8583c9 100644 --- a/.github/workflows/build-docker-windows.yml +++ b/.github/workflows/build-docker-windows.yml @@ -15,31 +15,21 @@ jobs: steps: - name: Pull respository uses: actions/checkout@v4 - # - name: Install Qt(android) - # uses: jurplel/install-qt-action@v4 - # with: - # aqtversion: '==3.1.*' - # target: android - # arch: android_armv7 - # host: linux - # dir: ${{ github.workspace }} - # modules: ${{env.QT_MODULES}} - # version: ${{ env.QT_VERSION }} - # - name: Install Qt(linux_gcc_64) - # uses: jurplel/install-qt-action@v4 - # with: - # aqtversion: '==3.1.*' - # target: desktop - # arch: linux_gcc_64 - # host: linux - # dir: ${{ github.workspace }} - # modules: ${{env.QT_MODULES}} - # version: ${{ env.QT_VERSION }} + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + aqtversion: '==3.1.*' + dir: ${{ github.workspace }} + version: ${{ env.QT_VERSION }} + target: desktop + arch: win64_msvc2022_64 + modules: ${{ env.QT_MODULES }} - name: Build docker image run: | #https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md docker build -t x-tools-windows-2022:amd64 . -f docker/win-ltsc2022/Dockerfile - name: Push docker image to github registry run: | + dir c: echo ${{ env.CR_PAT }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin docker rmi ghcr.io/x-tools-author/x-tools-windows-2022:amd64 || true docker tag x-tools-windows-2022:amd64 ghcr.io/x-tools-author/x-tools-windows-2022:amd64 diff --git a/docker/win-ltsc2022/Dockerfile b/docker/win-ltsc2022/Dockerfile index 29c97145..cc8ad05b 100644 --- a/docker/win-ltsc2022/Dockerfile +++ b/docker/win-ltsc2022/Dockerfile @@ -1,3 +1,4 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 -# Install CMake 3.30.8 to C:\Tools\CMake \ No newline at end of file +# Copy Qt to Container +COPY Qt C:\Qt \ No newline at end of file