From 40df9266d8c44cd9e942c14de19a57ed8324765e Mon Sep 17 00:00:00 2001 From: x-tools-author Date: Tue, 27 May 2025 18:00:30 +0800 Subject: [PATCH] chore: remove useless code --- .github/workflows/build-docker-windows.yml | 41 ----------------- docker/20.04/Dockerfile-backup20250426 | 52 ---------------------- docker/win-ltsc2022/Dockerfile | 4 -- 3 files changed, 97 deletions(-) delete mode 100644 .github/workflows/build-docker-windows.yml delete mode 100644 docker/20.04/Dockerfile-backup20250426 delete mode 100644 docker/win-ltsc2022/Dockerfile diff --git a/.github/workflows/build-docker-windows.yml b/.github/workflows/build-docker-windows.yml deleted file mode 100644 index 88bd5727..00000000 --- a/.github/workflows/build-docker-windows.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: build-docker(windows) -on: - workflow_dispatch: # Enables manually - -env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CR_PAT: ${{ secrets.CR_PAT }} - QT_MODULES: 'qtcharts qtserialbus qtserialport qtwebsockets' - QT_VERSION: 6.8.3 - -jobs: - build: - name: Build - runs-on: windows-2022 - steps: - - name: Pull respository - uses: actions/checkout@v4 - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - aqtversion: '==3.1.*' - dir: ${{ github.workspace }} - version: ${{ env.QT_VERSION }} - target: desktop - arch: win64_mingw - modules: ${{ env.QT_MODULES }} - - name: Copy tools - run: | - where.exe gcc.exe - where.exe cmake.exe - dir - - name: Build docker image - run: | #https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md - echo %PATH% - docker build -t x-tools-windows-2022:amd64 . -f docker/win-ltsc2022/Dockerfile - - name: Push docker image to github registry - run: | - 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 - docker push ghcr.io/x-tools-author/x-tools-windows-2022:amd64 \ No newline at end of file diff --git a/docker/20.04/Dockerfile-backup20250426 b/docker/20.04/Dockerfile-backup20250426 deleted file mode 100644 index 64f12922..00000000 --- a/docker/20.04/Dockerfile-backup20250426 +++ /dev/null @@ -1,52 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get -y update -RUN apt-get install -y libxcb-xinerama0 libxcb-cursor-dev libudev-dev ninja-build libopengl-dev libglu1-mesa-dev mesa-common-dev -RUN export DEBIAN_FRONTEND=noninteractive && apt-get install -y gcc g++ wget p7zip-full libicu-dev tree grep git libglib2.0-dev -RUN apt-get install -y libxkb* libdbus* -RUN apt-get install -y libegl1-mesa-dev libfontconfig1-dev libfreetype6-dev libfreetype-dev -RUN export DEBIAN_FRONTEND=noninteractive && apt-get install -y fuse libfuse2 libfuse-dev kmod - -# CMake -RUN wget https://cmake.org/files/v3.30/cmake-3.30.8-linux-x86_64.sh -RUN chmod +x cmake-3.30.8-linux-x86_64.sh -RUN ./cmake-3.30.8-linux-x86_64.sh --skip-license --prefix=/usr/local -RUN rm cmake-3.30.8-linux-x86_64.sh - -# Qt -ENV QT_BAST_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.linux_gcc_64/6.8.3-0-202503201345qtbase-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z -ENV QT_CHARTS_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.addons.qtcharts.linux_gcc_64/6.8.3-0-202503201345qtcharts-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z -ENV QT_SERIAL_PORT_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.addons.qtserialport.linux_gcc_64/6.8.3-0-202503201345qtserialport-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z -ENV QT_SERIAL_BUS_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.addons.qtserialbus.linux_gcc_64/6.8.3-0-202503201345qtserialbus-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z -ENV QT_WEB_SOCKETS_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.addons.qtwebsockets.linux_gcc_64/6.8.3-0-202503201345qtwebsockets-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z -ENV QT_SVG_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.linux_gcc_64/6.8.3-0-202503201345qtsvg-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z -ENV QT_TOOLS_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.linux_gcc_64/6.8.3-0-202503201345qttools-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z -ENV QT_ICU_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.linux_gcc_64/6.8.3-0-202503201345icu-linux-Rhel8.6-x86_64.7z -ENV QT_PREFIX=/opt/qt - -# Extract Qt -RUN mkdir -p ${QT_PREFIX} -RUN wget ${QT_BAST_URL} -O qtbase.7z -RUN wget ${QT_CHARTS_URL} -O qtcharts.7z -RUN wget ${QT_SERIAL_PORT_URL} -O qtserialport.7z -RUN wget ${QT_SERIAL_BUS_URL} -O qtserialbus.7z -RUN wget ${QT_WEB_SOCKETS_URL} -O qtwebsockets.7z -RUN wget ${QT_SVG_URL} -O qtsvg.7z -RUN wget ${QT_TOOLS_URL} -O qttools.7z -RUN wget ${QT_ICU_URL} -O icu.7z - -RUN 7z x qtbase.7z -o${QT_PREFIX} && rm qtbase.7z -RUN 7z x qtcharts.7z -o${QT_PREFIX} && rm qtcharts.7z -RUN 7z x qtserialport.7z -o${QT_PREFIX} && rm qtserialport.7z -RUN 7z x qtserialbus.7z -o${QT_PREFIX} && rm qtserialbus.7z -RUN 7z x qtwebsockets.7z -o${QT_PREFIX} && rm qtwebsockets.7z -RUN 7z x qtsvg.7z -o${QT_PREFIX} && rm qtsvg.7z -RUN 7z x qttools.7z -o${QT_PREFIX} && rm qttools.7z -RUN 7z x icu.7z -o${QT_PREFIX}/lib && rm icu.7z - -# Set environment variables for Qt -ENV LD_LIBRARY_PATH ${QT_PREFIX}/lib:$LD_LIBRARY_PATH -ENV PATH ${QT_PREFIX}/bin:$PATH -ENV QT_PLUGIN_PATH ${QT_PREFIX}/plugins/ -ENV QML_IMPORT_PATH ${QT_PREFIX}/qml/ -ENV QML2_IMPORT_PATH ${QT_PREFIX}/qml/ \ No newline at end of file diff --git a/docker/win-ltsc2022/Dockerfile b/docker/win-ltsc2022/Dockerfile deleted file mode 100644 index 0ca102be..00000000 --- a/docker/win-ltsc2022/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 -#--------------------------------------------------------------------------------------------------- -# Copy File to Container -COPY Qt C:/Qt \ No newline at end of file