From 1c11bd5d1df45e261f8dd10e7c8602668af3f9c0 Mon Sep 17 00:00:00 2001 From: synacker Date: Sun, 8 Sep 2024 22:18:48 +0300 Subject: [PATCH 01/36] Updatted dependecies --- conanfile.py | 6 +++--- src/Daggy/CConsoleDaggy.cpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/conanfile.py b/conanfile.py index b6379f39..039e95e5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -69,11 +69,11 @@ def config_options(self): self.options["libssh2"].shared = True def build_requirements(self): - self.tool_requires("cmake/3.27.7") - self.tool_requires("gtest/1.13.0") + self.tool_requires("cmake/3.30.1") + self.tool_requires("gtest/1.15.0") def requirements(self): - self.requires("qt/6.6.1") + self.requires("qt/6.7.1") self.requires("kainjow-mustache/4.1") self.requires("yaml-cpp/0.8.0") self.requires("libssh2/1.11.0") diff --git a/src/Daggy/CConsoleDaggy.cpp b/src/Daggy/CConsoleDaggy.cpp index ace80d69..993a2fe7 100644 --- a/src/Daggy/CConsoleDaggy.cpp +++ b/src/Daggy/CConsoleDaggy.cpp @@ -40,10 +40,9 @@ CConsoleDaggy::CConsoleDaggy(QObject* parent) , need_hard_stop_(false) { qApp->setApplicationName("daggy"); - qApp->setApplicationVersion(DAGGY_VERSION_STANDARD); qApp->setOrganizationName(DAGGY_VENDOR); qApp->setApplicationVersion(DAGGY_VERSION_FULL); - qApp->setOrganizationDomain("daggy.dev"); + qApp->setOrganizationDomain("https://github.com/synacker/daggy"); connect(this, &CConsoleDaggy::interrupt, this, &CConsoleDaggy::stop, Qt::QueuedConnection); connect(qApp, &QCoreApplication::aboutToQuit, this, &CConsoleDaggy::fixPcaps); From ea6e0009305da7519dcf0ce127a0a79f32fb8650 Mon Sep 17 00:00:00 2001 From: synacker Date: Sun, 8 Sep 2024 22:29:37 +0300 Subject: [PATCH 02/36] Fixed github acrions --- .github/workflows/daggy-github-actions.yaml | 24 +-------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 9fe4f048..cd9528eb 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -8,10 +8,6 @@ on: jobs: linux-gcc12_x64: runs-on: ubuntu-latest - container: - image: docker.io/synacker2/daggy_gcc12 - env: - NOT_ON_C3I: 1 steps: - uses: actions/checkout@v4 with: @@ -81,13 +77,6 @@ jobs: c:\.conan2\ key: conan-data-msvc - - name: Cache QtIFW - uses: actions/cache@v3 - id: qt-ifw4 - with: - path: C:\QtIFW - key: qt-ifw4 - - name: Cache vc_redist uses: actions/cache@v3 id: vc_redist17 @@ -119,15 +108,6 @@ jobs: - name: Move vc_redist run: mv ~/downloads/vc_redist-x64.exe build/ - - name: Install QtIFW - run: | - if ( -not(Test-Path C:\QtIFW) ) { - $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -UseBasicParsing -OutFile ~/QtInstallerFramework-win-x86.exe 'https://download.qt.io/official_releases/qt-installer-framework/4.6.0/QtInstallerFramework-windows-x64-4.6.0.exe' - ~/QtInstallerFramework-win-x86.exe --am --al -c --root C:\QtIFW install - } - ls C:\QtIFW - - name: Conan config run: conan config install CI/conan @@ -163,7 +143,6 @@ jobs: with: name: daggy_win_x64 path: | - build/*.exe build/*.zip macos-clang13_x64: @@ -224,6 +203,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: daggy_macos_x64 - path: | - build/Release/*.dmg + path: build/Release/*.zip \ No newline at end of file From 022e69133ec5fcd67886464ef959ebc37bcd51b8 Mon Sep 17 00:00:00 2001 From: synacker Date: Sun, 8 Sep 2024 23:03:10 +0300 Subject: [PATCH 03/36] Some fixes for build --- .github/workflows/daggy-github-actions.yaml | 10 ++++ CI/docker/debian_gcc12/Dockerfile | 66 --------------------- CI/docker/debian_gcc12/README.md | 8 --- CMakeLists.txt | 3 +- src/Daggy/CConsoleDaggy.cpp | 2 +- 5 files changed, 13 insertions(+), 76 deletions(-) delete mode 100644 CI/docker/debian_gcc12/Dockerfile delete mode 100644 CI/docker/debian_gcc12/README.md diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index cd9528eb..8339293a 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -20,6 +20,16 @@ jobs: path: ~/.conan2/p key: conan-data-gcc12 + - name: Set up Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: '3.11' + cache: pip + + - run: pip install -r requirements.txt + - run: conan --version + - run: conan profile detect + - run: conan --version - run: conan profile detect diff --git a/CI/docker/debian_gcc12/Dockerfile b/CI/docker/debian_gcc12/Dockerfile deleted file mode 100644 index 9cd366fc..00000000 --- a/CI/docker/debian_gcc12/Dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -FROM debian:12 - -RUN apt-get update -y -RUN apt-get install -y \ - gcc \ - git \ - make \ - python3-pip \ - wget \ - doxygen \ - graphviz \ - strace \ - zip \ - pkg-config \ - rpm \ - build-essential \ - libfontconfig1-dev \ - libfreetype6-dev \ - libx11-dev \ - libx11-xcb-dev \ - libxext-dev \ - libxfixes-dev \ - libxi-dev \ - libxrender-dev \ - libxcb1-dev \ - libxcb-glx0-dev \ - libxcb-keysyms1-dev \ - libxcb-image0-dev \ - libxcb-shm0-dev \ - libxcb-icccm4-dev \ - libxcb-sync-dev \ - libxcb-xfixes0-dev \ - libxcb-shape0-dev \ - libxcb-randr0-dev \ - libxcb-render-util0-dev \ - libxcb-xinerama0-dev \ - libxcb-xkb-dev \ - libxkbcommon-dev \ - libxkbcommon-x11-dev \ - libgl1-mesa-dev \ - libvulkan-dev \ - libssl-dev \ - libxcb-util0-dev \ - xorg-dev \ - cmake \ - libxcb-dri3-dev \ - iputils-ping \ - libx11-dev \ - libx11-xcb-dev \ - libfontenc-dev \ - libice-dev \ - libsm-dev \ - libxau-dev \ - libxaw7-dev \ - libxcb-cursor-dev - - -RUN wget https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7.tar.gz -O /tmp/cmake-3.27.7.tar.gz -RUN tar -xvf /tmp/cmake-3.27.7.tar.gz -C /tmp && cd /tmp/cmake-3.27.7 && ./bootstrap -- && make && make install -RUN rm -rf /tmp/cmake-3.27.7.tar.gz -RUN rm -rf /tmp/cmake-3.27.7 - -RUN mv /usr/lib/python3.11/EXTERNALLY-MANAGED /usr/lib/python3.11/EXTERNALLY-MANAGED.old -RUN pip3 install conan - -RUN setcap cap_net_raw+ep /bin/ping diff --git a/CI/docker/debian_gcc12/README.md b/CI/docker/debian_gcc12/README.md deleted file mode 100644 index 9535246f..00000000 --- a/CI/docker/debian_gcc12/README.md +++ /dev/null @@ -1,8 +0,0 @@ -### Build -````docker build -t synacker2/daggy_gcc12 .```` - -### Run -````docker run --rm -it -v $(pwd):/home/daggy synacker2/daggy_gcc12```` - -### Push -````docker push synacker2/daggy_gcc12```` \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index c718107a..5c5513cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ # This cmake only for developing daggy -# Use ${PROJECT_SOURCE_DIR}/cmake/conan_provider.cmake for working from IDE. +# Use ${PROJECT_SOURCE_DIR}/cmake/conan_provider.cmake for working from IDE (see https://github.com/conan-io/cmake-conan for details) + cmake_minimum_required(VERSION 3.24.0) message(WARNING "This CMakeLists.txt only for developing") diff --git a/src/Daggy/CConsoleDaggy.cpp b/src/Daggy/CConsoleDaggy.cpp index 993a2fe7..65323974 100644 --- a/src/Daggy/CConsoleDaggy.cpp +++ b/src/Daggy/CConsoleDaggy.cpp @@ -41,7 +41,7 @@ CConsoleDaggy::CConsoleDaggy(QObject* parent) { qApp->setApplicationName("daggy"); qApp->setOrganizationName(DAGGY_VENDOR); - qApp->setApplicationVersion(DAGGY_VERSION_FULL); + qApp->setApplicationVersion(DAGGY_VERSION_STANDARD); qApp->setOrganizationDomain("https://github.com/synacker/daggy"); connect(this, &CConsoleDaggy::interrupt, this, &CConsoleDaggy::stop, Qt::QueuedConnection); From 61178c1a7c1930f380d34ffef826047fc709f3b6 Mon Sep 17 00:00:00 2001 From: synacker Date: Sun, 8 Sep 2024 23:06:03 +0300 Subject: [PATCH 04/36] Fixed linux build --- .github/workflows/daggy-github-actions.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 8339293a..75823969 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -30,9 +30,6 @@ jobs: - run: conan --version - run: conan profile detect - - run: conan --version - - run: conan profile detect - - name: Conan config run: conan config install CI/conan From b84e61d2acb6be1b355ed53d26580187955bb133 Mon Sep 17 00:00:00 2001 From: synacker Date: Sun, 8 Sep 2024 23:27:21 +0300 Subject: [PATCH 05/36] Added packages for linux. Temprary disabled other platforms --- .github/workflows/daggy-github-actions.yaml | 287 ++++++++++---------- 1 file changed, 146 insertions(+), 141 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 75823969..cf67f338 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -33,6 +33,11 @@ jobs: - name: Conan config run: conan config install CI/conan + - uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: libgl-dev libgl1-mesa-dev + version: 1.0 + - name: Conan install run: conan install . --build=missing --profile:build=linux-gcc12_x64 --profile:host=linux-gcc12_x64 --output-folder=. @@ -68,147 +73,147 @@ jobs: build/Release/*.rpm build/Release/*.zip - win-msvc193_x64: - runs-on: windows-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 + # win-msvc193_x64: + # runs-on: windows-latest + # steps: + # - uses: actions/checkout@v4 + # with: + # fetch-depth: 0 - - name: Cache conan packages - uses: actions/cache@v3 - id: conan-data-msvc - with: - path: | - ~/.conan2/p - c:\.conan2\ - key: conan-data-msvc - - - name: Cache vc_redist - uses: actions/cache@v3 - id: vc_redist17 - with: - path: ~/downloads - key: vc_redist17 - - - name: Set up Python 3.11 - uses: actions/setup-python@v4 - with: - python-version: '3.11' - cache: pip - - - run: pip install -r requirements.txt - - run: conan --version - - run: conan profile detect - - - name: Download vc_redist - run: | - if ( -not(Test-Path ~/downloads/vc_redist-x64.exe) ) { - $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -UseBasicParsing -OutFile ~/downloads/vc_redist-x64.exe 'https://aka.ms/vs/17/release/vc_redist.x64.exe' - } - ls ~/downloads - - - name: Make build dir - run: mkdir build - - - name: Move vc_redist - run: mv ~/downloads/vc_redist-x64.exe build/ - - - name: Conan config - run: conan config install CI/conan - - - name: Conan install - run: conan install . --build=missing --profile:build=win-msvc193_x64 --profile:host=win-msvc193_x64 -of . - - - name: Conan cache clean - working-directory: build - run: conan cache clean "*" --source --build --temp --download - - - name: git add safe dir - run: git config --global --add safe.directory %GITHUB_WORKSPACE% - - - name: Conan build - run: conan build . --profile:build=win-msvc193_x64 --profile:host=win-msvc193_x64 --build=missing -of . - - - name: Tests - working-directory: build - run: ctest -C Release --output-on-failure --output-junit tests/local_tests.xml - - - name: win-msvc193_x64 Tests Report - uses: mikepenz/action-junit-report@v4 - with: - report_paths: build/Release/tests/local_tests.xml - summary: win-msvc193_x64 Tests Report - - - name: Packaging - working-directory: build - run: cpack - - - name: Archive production artifacts - uses: actions/upload-artifact@v3 - with: - name: daggy_win_x64 - path: | - build/*.zip - - macos-clang13_x64: - runs-on: macos-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 + # - name: Cache conan packages + # uses: actions/cache@v3 + # id: conan-data-msvc + # with: + # path: | + # ~/.conan2/p + # c:\.conan2\ + # key: conan-data-msvc + + # - name: Cache vc_redist + # uses: actions/cache@v3 + # id: vc_redist17 + # with: + # path: ~/downloads + # key: vc_redist17 + + # - name: Set up Python 3.11 + # uses: actions/setup-python@v4 + # with: + # python-version: '3.11' + # cache: pip + + # - run: pip install -r requirements.txt + # - run: conan --version + # - run: conan profile detect + + # - name: Download vc_redist + # run: | + # if ( -not(Test-Path ~/downloads/vc_redist-x64.exe) ) { + # $ProgressPreference = 'SilentlyContinue' + # Invoke-WebRequest -UseBasicParsing -OutFile ~/downloads/vc_redist-x64.exe 'https://aka.ms/vs/17/release/vc_redist.x64.exe' + # } + # ls ~/downloads + + # - name: Make build dir + # run: mkdir build + + # - name: Move vc_redist + # run: mv ~/downloads/vc_redist-x64.exe build/ + + # - name: Conan config + # run: conan config install CI/conan + + # - name: Conan install + # run: conan install . --build=missing --profile:build=win-msvc193_x64 --profile:host=win-msvc193_x64 -of . + + # - name: Conan cache clean + # working-directory: build + # run: conan cache clean "*" --source --build --temp --download + + # - name: git add safe dir + # run: git config --global --add safe.directory %GITHUB_WORKSPACE% + + # - name: Conan build + # run: conan build . --profile:build=win-msvc193_x64 --profile:host=win-msvc193_x64 --build=missing -of . + + # - name: Tests + # working-directory: build + # run: ctest -C Release --output-on-failure --output-junit tests/local_tests.xml + + # - name: win-msvc193_x64 Tests Report + # uses: mikepenz/action-junit-report@v4 + # with: + # report_paths: build/Release/tests/local_tests.xml + # summary: win-msvc193_x64 Tests Report + + # - name: Packaging + # working-directory: build + # run: cpack + + # - name: Archive production artifacts + # uses: actions/upload-artifact@v3 + # with: + # name: daggy_win_x64 + # path: | + # build/*.zip + + # macos-clang13_x64: + # runs-on: macos-latest + # steps: + # - uses: actions/checkout@v4 + # with: + # fetch-depth: 0 - - name: Cache conan packages - uses: actions/cache@v3 - id: conan-data-clang - with: - path: ~/.conan2/p - key: conan-data-clang + # - name: Cache conan packages + # uses: actions/cache@v3 + # id: conan-data-clang + # with: + # path: ~/.conan2/p + # key: conan-data-clang - - name: Set up Python 3.11 - uses: actions/setup-python@v4 - with: - python-version: '3.11' - cache: pip - - - run: pip install -r requirements.txt - - run: conan --version - - run: conan profile detect - - - name: Conan config - run: conan config install CI/conan - - - name: Conan install - run: conan install . --build=missing --profile:build=macos-clang13_x64 --profile:host=macos-clang14_x64 -of . - - - name: Conan remove build folders - run: conan cache clean "*" --source --build --temp --download - - - name: Conan build - run: conan build . --profile:build=macos-clang13_x64 --profile:host=macos-clang14_x64 --build=missing -of . - - - name: daggy version - working-directory: build/Release - run: bin/daggy --version - - - name: Tests - working-directory: build/Release - run: ctest -C Release --output-on-failure --output-junit tests/local_tests.xml - - - name: macos-clang13_x64 Tests Report - uses: mikepenz/action-junit-report@v4 - with: - report_paths: build/Release/tests/local_tests.xml - summary: macos-clang13_x64 Tests Report - - - name: Packaging - working-directory: build/Release - run: cpack - - - name: Archive production artifacts - uses: actions/upload-artifact@v3 - with: - name: daggy_macos_x64 - path: - build/Release/*.zip \ No newline at end of file + # - name: Set up Python 3.11 + # uses: actions/setup-python@v4 + # with: + # python-version: '3.11' + # cache: pip + + # - run: pip install -r requirements.txt + # - run: conan --version + # - run: conan profile detect + + # - name: Conan config + # run: conan config install CI/conan + + # - name: Conan install + # run: conan install . --build=missing --profile:build=macos-clang13_x64 --profile:host=macos-clang14_x64 -of . + + # - name: Conan remove build folders + # run: conan cache clean "*" --source --build --temp --download + + # - name: Conan build + # run: conan build . --profile:build=macos-clang13_x64 --profile:host=macos-clang14_x64 --build=missing -of . + + # - name: daggy version + # working-directory: build/Release + # run: bin/daggy --version + + # - name: Tests + # working-directory: build/Release + # run: ctest -C Release --output-on-failure --output-junit tests/local_tests.xml + + # - name: macos-clang13_x64 Tests Report + # uses: mikepenz/action-junit-report@v4 + # with: + # report_paths: build/Release/tests/local_tests.xml + # summary: macos-clang13_x64 Tests Report + + # - name: Packaging + # working-directory: build/Release + # run: cpack + + # - name: Archive production artifacts + # uses: actions/upload-artifact@v3 + # with: + # name: daggy_macos_x64 + # path: + # build/Release/*.zip \ No newline at end of file From 78ea3af872f4e08ab6df91e4ff9a609ceba49591 Mon Sep 17 00:00:00 2001 From: synacker Date: Sun, 8 Sep 2024 23:33:21 +0300 Subject: [PATCH 06/36] Added packages for linux --- .github/workflows/daggy-github-actions.yaml | 47 ++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index cf67f338..25b93851 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -35,7 +35,52 @@ jobs: - uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: libgl-dev libgl1-mesa-dev + packages: libgl-dev \ + libgl1-mesa-dev \ + libx11-dev \ + libx11-xcb-dev \ + libfontenc-dev \ + libice-dev \ + libsm-dev \ + libxau-dev \ + libxaw7-dev \ + libx11-xcb-dev \ + libfontenc-dev \ + libxaw7-dev \ + libxcomposite-dev \ + libxcursor-dev \ + libxdamage-dev \ + libxfixes-dev \ + libxi-dev \ + libxinerama-dev \ + libxmu-dev \ + libxmuu-dev \ + libxpm-dev \ + libxrandr-dev \ + libxres-dev \ + libxss-dev \ + libxtst-dev \ + ibxv-dev \ + libxxf86vm-dev \ + libxcb-glx0-dev \ + libxcb-render-util0-dev \ + libxcb-xkb-dev \ + libxcb-icccm4-dev \ + libxcb-image0-dev \ + libxcb-keysyms1-dev \ + libxcb-randr0-dev \ + libxcb-shape0-dev \ + libxcb-sync-dev \ + libxcb-xfixes0-dev \ + libxcb-xinerama0-dev \ + libxcb-dri3-dev \ + libxcb-cursor-dev \ + libxcb-dri2-0-dev \ + libxcb-dri3-dev \ + libxcb-present-dev \ + libxcb-composite0-dev \ + libxcb-ewmh-dev \ + libxcb-res0-dev version: 1.0 - name: Conan install From 43e8a4c2b1da8701f484e854d0651d9d848c06b1 Mon Sep 17 00:00:00 2001 From: synacker Date: Sun, 8 Sep 2024 23:36:23 +0300 Subject: [PATCH 07/36] Added packages --- .github/workflows/daggy-github-actions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 25b93851..06074bea 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -46,7 +46,6 @@ jobs: libxaw7-dev \ libx11-xcb-dev \ libfontenc-dev \ - libxaw7-dev \ libxcomposite-dev \ libxcursor-dev \ libxdamage-dev \ @@ -80,7 +79,8 @@ jobs: libxcb-present-dev \ libxcb-composite0-dev \ libxcb-ewmh-dev \ - libxcb-res0-dev + libxcb-res0-dev \ + libxv-dev version: 1.0 - name: Conan install From 3c8526c2e796d01992e79d631a77ae63c133cf24 Mon Sep 17 00:00:00 2001 From: synacker Date: Sun, 8 Sep 2024 23:38:16 +0300 Subject: [PATCH 08/36] Added package --- .github/workflows/daggy-github-actions.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 06074bea..aa609bcc 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -80,7 +80,9 @@ jobs: libxcb-composite0-dev \ libxcb-ewmh-dev \ libxcb-res0-dev \ - libxv-dev + libxv-dev \ + libxcb-util-dev \ + libxcb-util0-dev version: 1.0 - name: Conan install From f4e9fe1a0cf0cf98a1216e9375dac59fa7b07612 Mon Sep 17 00:00:00 2001 From: synacker Date: Mon, 9 Sep 2024 00:07:46 +0300 Subject: [PATCH 09/36] Return windows build --- .github/workflows/daggy-github-actions.yaml | 123 +++++++++----------- CI/conan/profiles/macos-clang13_x64 | 8 -- CI/conan/profiles/win-msvc193_x64 | 9 -- 3 files changed, 54 insertions(+), 86 deletions(-) delete mode 100644 CI/conan/profiles/macos-clang13_x64 delete mode 100644 CI/conan/profiles/win-msvc193_x64 diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index aa609bcc..6594b20d 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -120,89 +120,74 @@ jobs: build/Release/*.rpm build/Release/*.zip - # win-msvc193_x64: - # runs-on: windows-latest - # steps: - # - uses: actions/checkout@v4 - # with: - # fetch-depth: 0 + win-msvc193_x64: + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 - # - name: Cache conan packages - # uses: actions/cache@v3 - # id: conan-data-msvc - # with: - # path: | - # ~/.conan2/p - # c:\.conan2\ - # key: conan-data-msvc - - # - name: Cache vc_redist - # uses: actions/cache@v3 - # id: vc_redist17 - # with: - # path: ~/downloads - # key: vc_redist17 - - # - name: Set up Python 3.11 - # uses: actions/setup-python@v4 - # with: - # python-version: '3.11' - # cache: pip + - name: Cache conan packages + uses: actions/cache@v3 + id: conan-data-msvc + with: + path: | + ~/.conan2/p + c:\.conan2\ + key: conan-data-msvc - # - run: pip install -r requirements.txt - # - run: conan --version - # - run: conan profile detect + - name: Set up Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: '3.11' + cache: pip - # - name: Download vc_redist - # run: | - # if ( -not(Test-Path ~/downloads/vc_redist-x64.exe) ) { - # $ProgressPreference = 'SilentlyContinue' - # Invoke-WebRequest -UseBasicParsing -OutFile ~/downloads/vc_redist-x64.exe 'https://aka.ms/vs/17/release/vc_redist.x64.exe' - # } - # ls ~/downloads + - run: pip install -r requirements.txt + - run: conan --version + - run: conan profile detect - # - name: Make build dir - # run: mkdir build + - name: Make build dir + run: mkdir build - # - name: Move vc_redist - # run: mv ~/downloads/vc_redist-x64.exe build/ + - name: Move vc_redist + run: mv ~/downloads/vc_redist-x64.exe build/ - # - name: Conan config - # run: conan config install CI/conan + - name: Conan config + run: conan config install CI/conan - # - name: Conan install - # run: conan install . --build=missing --profile:build=win-msvc193_x64 --profile:host=win-msvc193_x64 -of . + - name: Conan install + run: conan install . --build=missing -of . - # - name: Conan cache clean - # working-directory: build - # run: conan cache clean "*" --source --build --temp --download + - name: Conan cache clean + working-directory: build + run: conan cache clean "*" --source --build --temp --download - # - name: git add safe dir - # run: git config --global --add safe.directory %GITHUB_WORKSPACE% + - name: git add safe dir + run: git config --global --add safe.directory %GITHUB_WORKSPACE% - # - name: Conan build - # run: conan build . --profile:build=win-msvc193_x64 --profile:host=win-msvc193_x64 --build=missing -of . + - name: Conan build + run: conan build . --profile:build=win-msvc193_x64 --profile:host=win-msvc193_x64 --build=missing -of . - # - name: Tests - # working-directory: build - # run: ctest -C Release --output-on-failure --output-junit tests/local_tests.xml + - name: Tests + working-directory: build + run: ctest -C Release --output-on-failure --output-junit tests/local_tests.xml - # - name: win-msvc193_x64 Tests Report - # uses: mikepenz/action-junit-report@v4 - # with: - # report_paths: build/Release/tests/local_tests.xml - # summary: win-msvc193_x64 Tests Report + - name: win-msvc193_x64 Tests Report + uses: mikepenz/action-junit-report@v4 + with: + report_paths: build/Release/tests/local_tests.xml + summary: win-msvc193_x64 Tests Report - # - name: Packaging - # working-directory: build - # run: cpack + - name: Packaging + working-directory: build + run: cpack - # - name: Archive production artifacts - # uses: actions/upload-artifact@v3 - # with: - # name: daggy_win_x64 - # path: | - # build/*.zip + - name: Archive production artifacts + uses: actions/upload-artifact@v3 + with: + name: daggy_win_x64 + path: | + build/*.zip # macos-clang13_x64: # runs-on: macos-latest diff --git a/CI/conan/profiles/macos-clang13_x64 b/CI/conan/profiles/macos-clang13_x64 deleted file mode 100644 index ef216cfd..00000000 --- a/CI/conan/profiles/macos-clang13_x64 +++ /dev/null @@ -1,8 +0,0 @@ -[settings] -os=Macos -arch=x86_64 -compiler=apple-clang -compiler.version=13 -compiler.cppstd=17 -compiler.libcxx=libc++ -build_type=Release \ No newline at end of file diff --git a/CI/conan/profiles/win-msvc193_x64 b/CI/conan/profiles/win-msvc193_x64 deleted file mode 100644 index 4364a4f3..00000000 --- a/CI/conan/profiles/win-msvc193_x64 +++ /dev/null @@ -1,9 +0,0 @@ -[settings] -os=Windows -arch=x86_64 -compiler=msvc -compiler.version=193 -compiler.runtime=dynamic -compiler.cppstd=17 -compiler.runtime_type=Release -build_type=Release From c04a5bb1e75d757e6dcd5ebaa7b5c328a55166c8 Mon Sep 17 00:00:00 2001 From: synacker Date: Mon, 9 Sep 2024 00:12:27 +0300 Subject: [PATCH 10/36] Returned macos --- .github/workflows/daggy-github-actions.yaml | 116 ++++++++++---------- src/cmake/pack.cmake | 2 +- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 6594b20d..78e1fafc 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -189,63 +189,63 @@ jobs: path: | build/*.zip - # macos-clang13_x64: - # runs-on: macos-latest - # steps: - # - uses: actions/checkout@v4 - # with: - # fetch-depth: 0 + macos-clang13_x64: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 - # - name: Cache conan packages - # uses: actions/cache@v3 - # id: conan-data-clang - # with: - # path: ~/.conan2/p - # key: conan-data-clang + - name: Cache conan packages + uses: actions/cache@v3 + id: conan-data-clang + with: + path: ~/.conan2/p + key: conan-data-clang - # - name: Set up Python 3.11 - # uses: actions/setup-python@v4 - # with: - # python-version: '3.11' - # cache: pip - - # - run: pip install -r requirements.txt - # - run: conan --version - # - run: conan profile detect - - # - name: Conan config - # run: conan config install CI/conan - - # - name: Conan install - # run: conan install . --build=missing --profile:build=macos-clang13_x64 --profile:host=macos-clang14_x64 -of . - - # - name: Conan remove build folders - # run: conan cache clean "*" --source --build --temp --download - - # - name: Conan build - # run: conan build . --profile:build=macos-clang13_x64 --profile:host=macos-clang14_x64 --build=missing -of . - - # - name: daggy version - # working-directory: build/Release - # run: bin/daggy --version - - # - name: Tests - # working-directory: build/Release - # run: ctest -C Release --output-on-failure --output-junit tests/local_tests.xml - - # - name: macos-clang13_x64 Tests Report - # uses: mikepenz/action-junit-report@v4 - # with: - # report_paths: build/Release/tests/local_tests.xml - # summary: macos-clang13_x64 Tests Report - - # - name: Packaging - # working-directory: build/Release - # run: cpack - - # - name: Archive production artifacts - # uses: actions/upload-artifact@v3 - # with: - # name: daggy_macos_x64 - # path: - # build/Release/*.zip \ No newline at end of file + - name: Set up Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: '3.11' + cache: pip + + - run: pip install -r requirements.txt + - run: conan --version + - run: conan profile detect + + - name: Conan config + run: conan config install CI/conan + + - name: Conan install + run: conan install . --build=missing --profile:build=macos-clang13_x64 --profile:host=macos-clang14_x64 -of . + + - name: Conan remove build folders + run: conan cache clean "*" --source --build --temp --download + + - name: Conan build + run: conan build . --build=missing -of . + + - name: daggy version + working-directory: build/Release + run: bin/daggy --version + + - name: Tests + working-directory: build/Release + run: ctest -C Release --output-on-failure --output-junit tests/local_tests.xml + + - name: macos-clang13_x64 Tests Report + uses: mikepenz/action-junit-report@v4 + with: + report_paths: build/Release/tests/local_tests.xml + summary: macos-clang13_x64 Tests Report + + - name: Packaging + working-directory: build/Release + run: cpack + + - name: Archive production artifacts + uses: actions/upload-artifact@v3 + with: + name: daggy_macos_x64 + path: + build/Release/*.zip \ No newline at end of file diff --git a/src/cmake/pack.cmake b/src/cmake/pack.cmake index 73420403..ceb55b1f 100644 --- a/src/cmake/pack.cmake +++ b/src/cmake/pack.cmake @@ -8,7 +8,7 @@ set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}") if(WIN32) - set(CPACK_GENERATOR ZIP IFW) + set(CPACK_GENERATOR ZIP) set(CPACK_IFW_ROOT "C:/QtIFW") set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) From b65d05fe6fff9b61a720b5e571fb2ae61e95dfde Mon Sep 17 00:00:00 2001 From: synacker Date: Mon, 9 Sep 2024 00:19:17 +0300 Subject: [PATCH 11/36] Fixed macois and win actions --- .github/workflows/daggy-github-actions.yaml | 9 +++------ CI/conan/profiles/macos-clang14_x64 | 8 -------- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 CI/conan/profiles/macos-clang14_x64 diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 78e1fafc..fc974d9d 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -83,7 +83,7 @@ jobs: libxv-dev \ libxcb-util-dev \ libxcb-util0-dev - version: 1.0 + version: syspackages - name: Conan install run: conan install . --build=missing --profile:build=linux-gcc12_x64 --profile:host=linux-gcc12_x64 --output-folder=. @@ -149,9 +149,6 @@ jobs: - name: Make build dir run: mkdir build - - name: Move vc_redist - run: mv ~/downloads/vc_redist-x64.exe build/ - - name: Conan config run: conan config install CI/conan @@ -166,7 +163,7 @@ jobs: run: git config --global --add safe.directory %GITHUB_WORKSPACE% - name: Conan build - run: conan build . --profile:build=win-msvc193_x64 --profile:host=win-msvc193_x64 --build=missing -of . + run: conan build . --build=missing -of . - name: Tests working-directory: build @@ -217,7 +214,7 @@ jobs: run: conan config install CI/conan - name: Conan install - run: conan install . --build=missing --profile:build=macos-clang13_x64 --profile:host=macos-clang14_x64 -of . + run: conan install . --build=missing -of . - name: Conan remove build folders run: conan cache clean "*" --source --build --temp --download diff --git a/CI/conan/profiles/macos-clang14_x64 b/CI/conan/profiles/macos-clang14_x64 deleted file mode 100644 index 349e8d4e..00000000 --- a/CI/conan/profiles/macos-clang14_x64 +++ /dev/null @@ -1,8 +0,0 @@ -[settings] -os=Macos -arch=x86_64 -compiler=apple-clang -compiler.version=14 -compiler.cppstd=17 -compiler.libcxx=libc++ -build_type=Release \ No newline at end of file From 64df53c88d9c3e0d336c63c4e7fe007fa574074e Mon Sep 17 00:00:00 2001 From: synacker Date: Mon, 9 Sep 2024 00:51:35 +0300 Subject: [PATCH 12/36] Updated C++ standard --- .github/workflows/daggy-github-actions.yaml | 8 ++++---- CI/conan/profiles/linux-gcc12_x64 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index fc974d9d..8da24c28 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -120,7 +120,7 @@ jobs: build/Release/*.rpm build/Release/*.zip - win-msvc193_x64: + win: runs-on: windows-latest steps: - uses: actions/checkout@v4 @@ -153,7 +153,7 @@ jobs: run: conan config install CI/conan - name: Conan install - run: conan install . --build=missing -of . + run: conan install . --build=missing -s compiler.cppstd=17 -of . - name: Conan cache clean working-directory: build @@ -186,7 +186,7 @@ jobs: path: | build/*.zip - macos-clang13_x64: + macos: runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -214,7 +214,7 @@ jobs: run: conan config install CI/conan - name: Conan install - run: conan install . --build=missing -of . + run: conan install . --build=missing -s compiler.cppstd=17 -of . - name: Conan remove build folders run: conan cache clean "*" --source --build --temp --download diff --git a/CI/conan/profiles/linux-gcc12_x64 b/CI/conan/profiles/linux-gcc12_x64 index f6cbf4d7..4f3004ee 100644 --- a/CI/conan/profiles/linux-gcc12_x64 +++ b/CI/conan/profiles/linux-gcc12_x64 @@ -3,6 +3,6 @@ os=Linux arch=x86_64 compiler=gcc compiler.version=12 -compiler.cppstd=gnu17 +compiler.cppstd=17 compiler.libcxx=libstdc++ build_type=Release \ No newline at end of file From 26d16b208c21d0d55a212a1b4b037a68a1eb1a45 Mon Sep 17 00:00:00 2001 From: synacker Date: Mon, 9 Sep 2024 22:55:20 +0300 Subject: [PATCH 13/36] Moved install apt packages to separate step without extensions --- .github/workflows/daggy-github-actions.yaml | 100 ++++++++++---------- 1 file changed, 49 insertions(+), 51 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 8da24c28..c8b7bcf9 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -33,57 +33,55 @@ jobs: - name: Conan config run: conan config install CI/conan - - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: libgl-dev \ - libgl1-mesa-dev \ - libx11-dev \ - libx11-xcb-dev \ - libfontenc-dev \ - libice-dev \ - libsm-dev \ - libxau-dev \ - libxaw7-dev \ - libx11-xcb-dev \ - libfontenc-dev \ - libxcomposite-dev \ - libxcursor-dev \ - libxdamage-dev \ - libxfixes-dev \ - libxi-dev \ - libxinerama-dev \ - libxmu-dev \ - libxmuu-dev \ - libxpm-dev \ - libxrandr-dev \ - libxres-dev \ - libxss-dev \ - libxtst-dev \ - ibxv-dev \ - libxxf86vm-dev \ - libxcb-glx0-dev \ - libxcb-render-util0-dev \ - libxcb-xkb-dev \ - libxcb-icccm4-dev \ - libxcb-image0-dev \ - libxcb-keysyms1-dev \ - libxcb-randr0-dev \ - libxcb-shape0-dev \ - libxcb-sync-dev \ - libxcb-xfixes0-dev \ - libxcb-xinerama0-dev \ - libxcb-dri3-dev \ - libxcb-cursor-dev \ - libxcb-dri2-0-dev \ - libxcb-dri3-dev \ - libxcb-present-dev \ - libxcb-composite0-dev \ - libxcb-ewmh-dev \ - libxcb-res0-dev \ - libxv-dev \ - libxcb-util-dev \ - libxcb-util0-dev - version: syspackages + - name: install system deps + run: sudo apt-get install -y libgl-dev \ + libgl1-mesa-dev \ + libx11-dev \ + libx11-xcb-dev \ + libfontenc-dev \ + libice-dev \ + libsm-dev \ + libxau-dev \ + libxaw7-dev \ + libx11-xcb-dev \ + libfontenc-dev \ + libxcomposite-dev \ + libxcursor-dev \ + libxdamage-dev \ + libxfixes-dev \ + libxi-dev \ + libxinerama-dev \ + libxmu-dev \ + libxmuu-dev \ + libxpm-dev \ + libxrandr-dev \ + libxres-dev \ + libxss-dev \ + libxtst-dev \ + ibxv-dev \ + libxxf86vm-dev \ + libxcb-glx0-dev \ + libxcb-render-util0-dev \ + libxcb-xkb-dev \ + libxcb-icccm4-dev \ + libxcb-image0-dev \ + libxcb-keysyms1-dev \ + libxcb-randr0-dev \ + libxcb-shape0-dev \ + libxcb-sync-dev \ + libxcb-xfixes0-dev \ + libxcb-xinerama0-dev \ + libxcb-dri3-dev \ + libxcb-cursor-dev \ + libxcb-dri2-0-dev \ + libxcb-dri3-dev \ + libxcb-present-dev \ + libxcb-composite0-dev \ + libxcb-ewmh-dev \ + libxcb-res0-dev \ + libxv-dev \ + libxcb-util-dev \ + libxcb-util0-dev - name: Conan install run: conan install . --build=missing --profile:build=linux-gcc12_x64 --profile:host=linux-gcc12_x64 --output-folder=. From 7965db26bd7b7a72b857b5ab0a07fb74cda12642 Mon Sep 17 00:00:00 2001 From: synacker Date: Mon, 9 Sep 2024 23:08:01 +0300 Subject: [PATCH 14/36] Return deb actions --- .github/workflows/daggy-github-actions.yaml | 101 ++++++++++---------- 1 file changed, 52 insertions(+), 49 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index c8b7bcf9..8fc8380e 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -33,55 +33,58 @@ jobs: - name: Conan config run: conan config install CI/conan - - name: install system deps - run: sudo apt-get install -y libgl-dev \ - libgl1-mesa-dev \ - libx11-dev \ - libx11-xcb-dev \ - libfontenc-dev \ - libice-dev \ - libsm-dev \ - libxau-dev \ - libxaw7-dev \ - libx11-xcb-dev \ - libfontenc-dev \ - libxcomposite-dev \ - libxcursor-dev \ - libxdamage-dev \ - libxfixes-dev \ - libxi-dev \ - libxinerama-dev \ - libxmu-dev \ - libxmuu-dev \ - libxpm-dev \ - libxrandr-dev \ - libxres-dev \ - libxss-dev \ - libxtst-dev \ - ibxv-dev \ - libxxf86vm-dev \ - libxcb-glx0-dev \ - libxcb-render-util0-dev \ - libxcb-xkb-dev \ - libxcb-icccm4-dev \ - libxcb-image0-dev \ - libxcb-keysyms1-dev \ - libxcb-randr0-dev \ - libxcb-shape0-dev \ - libxcb-sync-dev \ - libxcb-xfixes0-dev \ - libxcb-xinerama0-dev \ - libxcb-dri3-dev \ - libxcb-cursor-dev \ - libxcb-dri2-0-dev \ - libxcb-dri3-dev \ - libxcb-present-dev \ - libxcb-composite0-dev \ - libxcb-ewmh-dev \ - libxcb-res0-dev \ - libxv-dev \ - libxcb-util-dev \ - libxcb-util0-dev + - uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: libgl-dev \ + libgl1-mesa-dev \ + libx11-dev \ + libx11-xcb-dev \ + libfontenc-dev \ + libice-dev \ + libsm-dev \ + libxau-dev \ + libxaw7-dev \ + libx11-xcb-dev \ + libfontenc-dev \ + libxcomposite-dev \ + libxcursor-dev \ + libxdamage-dev \ + libxfixes-dev \ + libxi-dev \ + libxinerama-dev \ + libxmu-dev \ + libxmuu-dev \ + libxpm-dev \ + libxrandr-dev \ + libxres-dev \ + libxss-dev \ + libxtst-dev \ + ibxv-dev \ + libxxf86vm-dev \ + libxcb-glx0-dev \ + libxcb-render-util0-dev \ + libxcb-xkb-dev \ + libxcb-icccm4-dev \ + libxcb-image0-dev \ + libxcb-keysyms1-dev \ + libxcb-randr0-dev \ + libxcb-shape0-dev \ + libxcb-sync-dev \ + libxcb-xfixes0-dev \ + libxcb-xinerama0-dev \ + libxcb-dri3-dev \ + libxcb-cursor-dev \ + libxcb-dri2-0-dev \ + libxcb-dri3-dev \ + libxcb-present-dev \ + libxcb-composite0-dev \ + libxcb-ewmh-dev \ + libxcb-res0-dev \ + libxv-dev \ + libxcb-util-dev \ + libxcb-util0-dev + version: syspackages + - name: Conan install run: conan install . --build=missing --profile:build=linux-gcc12_x64 --profile:host=linux-gcc12_x64 --output-folder=. From c4614dfeae6c7980b83ad5799a6562ec6933ca0b Mon Sep 17 00:00:00 2001 From: synacker Date: Mon, 9 Sep 2024 23:50:44 +0300 Subject: [PATCH 15/36] Fixed standard for win --- .github/workflows/daggy-github-actions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 8fc8380e..1cad5ce1 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -164,7 +164,7 @@ jobs: run: git config --global --add safe.directory %GITHUB_WORKSPACE% - name: Conan build - run: conan build . --build=missing -of . + run: conan build . --build=missing -s compiler.cppstd=17 -of . - name: Tests working-directory: build @@ -221,7 +221,7 @@ jobs: run: conan cache clean "*" --source --build --temp --download - name: Conan build - run: conan build . --build=missing -of . + run: conan build . --build=missing -s compiler.cppstd=17 -of . - name: daggy version working-directory: build/Release From a5caa1fa8ac8786464e3cefe304bf884ff48f767 Mon Sep 17 00:00:00 2001 From: synacker Date: Mon, 9 Sep 2024 23:59:57 +0300 Subject: [PATCH 16/36] Tried to fix install deb packages --- .github/workflows/daggy-github-actions.yaml | 48 ++++++++++----------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 1cad5ce1..f427b1de 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -13,29 +13,8 @@ jobs: with: fetch-depth: 0 - - name: Cache conan packages - uses: actions/cache@v3 - id: conan-data-gcc12 - with: - path: ~/.conan2/p - key: conan-data-gcc12 - - - name: Set up Python 3.11 - uses: actions/setup-python@v4 - with: - python-version: '3.11' - cache: pip - - - run: pip install -r requirements.txt - - run: conan --version - - run: conan profile detect - - - name: Conan config - run: conan config install CI/conan - - - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: libgl-dev \ + - name: Setup environment + run: apt-get install -y libgl-dev \ libgl1-mesa-dev \ libx11-dev \ libx11-xcb-dev \ @@ -83,8 +62,27 @@ jobs: libxv-dev \ libxcb-util-dev \ libxcb-util0-dev - version: syspackages + shell: bash + + - name: Cache conan packages + uses: actions/cache@v3 + id: conan-data-gcc12 + with: + path: ~/.conan2/p + key: conan-data-gcc12 + + - name: Set up Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: '3.11' + cache: pip + + - run: pip install -r requirements.txt + - run: conan --version + - run: conan profile detect + - name: Conan config + run: conan config install CI/conan - name: Conan install run: conan install . --build=missing --profile:build=linux-gcc12_x64 --profile:host=linux-gcc12_x64 --output-folder=. @@ -122,7 +120,7 @@ jobs: build/Release/*.zip win: - runs-on: windows-latest + runs-on: windows-latest-s compiler.cppstd=17 steps: - uses: actions/checkout@v4 with: From 0a59abc2e5866e8fee22c8a9a21857dce866e56e Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 00:36:08 +0300 Subject: [PATCH 17/36] Added sudo for install deb packages --- .github/workflows/daggy-github-actions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index f427b1de..40057657 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -14,7 +14,7 @@ jobs: fetch-depth: 0 - name: Setup environment - run: apt-get install -y libgl-dev \ + run: sudo apt-get install -y libgl-dev \ libgl1-mesa-dev \ libx11-dev \ libx11-xcb-dev \ From ec89fe254c7d93ac400c356affd5ffb11296d023 Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 00:39:40 +0300 Subject: [PATCH 18/36] Fix --- .github/workflows/daggy-github-actions.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 40057657..d66e844f 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -13,6 +13,7 @@ jobs: with: fetch-depth: 0 + - run: sudo apt-get update - name: Setup environment run: sudo apt-get install -y libgl-dev \ libgl1-mesa-dev \ @@ -120,7 +121,7 @@ jobs: build/Release/*.zip win: - runs-on: windows-latest-s compiler.cppstd=17 + runs-on: windows-latest steps: - uses: actions/checkout@v4 with: From 2138d028f75df88fa1deba545056c89751368284 Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 00:41:26 +0300 Subject: [PATCH 19/36] Fix --- .github/workflows/daggy-github-actions.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index d66e844f..1b2e48b7 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -13,9 +13,10 @@ jobs: with: fetch-depth: 0 - - run: sudo apt-get update - name: Setup environment - run: sudo apt-get install -y libgl-dev \ + run: | + sudo apt-get update + sudo apt-get install -y libgl-dev \ libgl1-mesa-dev \ libx11-dev \ libx11-xcb-dev \ From bbfe7d269b63438cf6a4dda264d9c0a2d8e6ad45 Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 00:45:18 +0300 Subject: [PATCH 20/36] Fix --- .github/workflows/daggy-github-actions.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 1b2e48b7..8bc7af23 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -14,9 +14,8 @@ jobs: fetch-depth: 0 - name: Setup environment - run: | - sudo apt-get update - sudo apt-get install -y libgl-dev \ + run: sudo apt-get update && \ + sudo apt-get install -y libgl-dev \ libgl1-mesa-dev \ libx11-dev \ libx11-xcb-dev \ From 3c1c6507f2692d79398bed8ba92fb172bb7d8f36 Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 00:47:13 +0300 Subject: [PATCH 21/36] Fix --- .github/workflows/daggy-github-actions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 8bc7af23..dd359ac1 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -15,7 +15,7 @@ jobs: - name: Setup environment run: sudo apt-get update && \ - sudo apt-get install -y libgl-dev \ + apt-get install -y libgl-dev \ libgl1-mesa-dev \ libx11-dev \ libx11-xcb-dev \ From 45dde3fd99ba782b6a8de70b19968f448d4e6d63 Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 00:48:41 +0300 Subject: [PATCH 22/36] Fix --- .github/workflows/daggy-github-actions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index dd359ac1..92ac24ad 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -14,8 +14,8 @@ jobs: fetch-depth: 0 - name: Setup environment - run: sudo apt-get update && \ - apt-get install -y libgl-dev \ + run: sudo apt-get update && apt-get install -y \ + libgl-dev \ libgl1-mesa-dev \ libx11-dev \ libx11-xcb-dev \ From 5ede25cee63c57c09fed8acdb03ccd645bb224af Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 00:49:40 +0300 Subject: [PATCH 23/36] Fix --- .github/workflows/daggy-github-actions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 92ac24ad..aba84fe5 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -14,7 +14,7 @@ jobs: fetch-depth: 0 - name: Setup environment - run: sudo apt-get update && apt-get install -y \ + run: sudo apt-get update && sudo apt-get install -y \ libgl-dev \ libgl1-mesa-dev \ libx11-dev \ From a39f461f29f21f6cc12e41c29543f01820d59c6c Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 00:52:30 +0300 Subject: [PATCH 24/36] Fix --- .github/workflows/daggy-github-actions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index aba84fe5..b4ac8678 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -14,7 +14,7 @@ jobs: fetch-depth: 0 - name: Setup environment - run: sudo apt-get update && sudo apt-get install -y \ + run: sudo apt update && sudo apt-get install -y \ libgl-dev \ libgl1-mesa-dev \ libx11-dev \ From e34693c07d6629810f1469a33a9e974491b84c8b Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 01:06:39 +0300 Subject: [PATCH 25/36] Fix --- .github/workflows/daggy-github-actions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index b4ac8678..51ba1bc3 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -7,14 +7,14 @@ on: jobs: linux-gcc12_x64: - runs-on: ubuntu-latest + runs-on: ubuntu:20.04 steps: - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup environment - run: sudo apt update && sudo apt-get install -y \ + run: sudo apt update && sudo apt-get install -y libgl-dev \ libgl-dev \ libgl1-mesa-dev \ libx11-dev \ From 8088f88520b5950ff2959bdd119373525f1d0a37 Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 01:08:23 +0300 Subject: [PATCH 26/36] Fix --- .github/workflows/daggy-github-actions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 51ba1bc3..8fd187d5 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -7,7 +7,7 @@ on: jobs: linux-gcc12_x64: - runs-on: ubuntu:20.04 + runs-on: ubuntu:24.04 steps: - uses: actions/checkout@v4 with: From ef6e6f3e44e735fc12e174d073a1ced42f1da611 Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 01:10:04 +0300 Subject: [PATCH 27/36] Fix --- .github/workflows/daggy-github-actions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 8fd187d5..707b0e6a 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -7,7 +7,7 @@ on: jobs: linux-gcc12_x64: - runs-on: ubuntu:24.04 + runs-on: ubuntu:22.04 steps: - uses: actions/checkout@v4 with: From d454de0484305724b456d4cafce8c76c4ce0993f Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 01:11:03 +0300 Subject: [PATCH 28/36] Fix --- .github/workflows/daggy-github-actions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 707b0e6a..707f1dba 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -7,7 +7,7 @@ on: jobs: linux-gcc12_x64: - runs-on: ubuntu:22.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: From db181aeaa0399758828ba699c7ef3ce0fb9b07c1 Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 01:12:53 +0300 Subject: [PATCH 29/36] Fix --- .github/workflows/daggy-github-actions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 707f1dba..de4584b1 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -7,7 +7,7 @@ on: jobs: linux-gcc12_x64: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 with: From 4eb87fbf0ac7b4804f3b16c9d00be3edff3cb346 Mon Sep 17 00:00:00 2001 From: synacker Date: Tue, 10 Sep 2024 01:14:28 +0300 Subject: [PATCH 30/36] Fix --- .github/workflows/daggy-github-actions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index de4584b1..ffdcd7f2 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -14,7 +14,7 @@ jobs: fetch-depth: 0 - name: Setup environment - run: sudo apt update && sudo apt-get install -y libgl-dev \ + run: sudo apt-get update && sudo apt-get install -y libgl-dev \ libgl-dev \ libgl1-mesa-dev \ libx11-dev \ From d703dbd44d55a345f4f1209f21d390665bbe9a8b Mon Sep 17 00:00:00 2001 From: synacker Date: Wed, 11 Sep 2024 23:56:51 +0300 Subject: [PATCH 31/36] Fix --- .github/workflows/daggy-github-actions.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index ffdcd7f2..b2b57eaa 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -14,7 +14,9 @@ jobs: fetch-depth: 0 - name: Setup environment - run: sudo apt-get update && sudo apt-get install -y libgl-dev \ + run: | + sudo apt-get update + sudo apt-get install -y libgl-dev \ libgl-dev \ libgl1-mesa-dev \ libx11-dev \ From e951b70918ad85e60b8d96ef5d906ce321035510 Mon Sep 17 00:00:00 2001 From: synacker Date: Wed, 11 Sep 2024 23:57:54 +0300 Subject: [PATCH 32/36] Fix --- .github/workflows/daggy-github-actions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index b2b57eaa..53e70e75 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -41,7 +41,7 @@ jobs: libxres-dev \ libxss-dev \ libxtst-dev \ - ibxv-dev \ + libxv-dev \ libxxf86vm-dev \ libxcb-glx0-dev \ libxcb-render-util0-dev \ From 8e6aa969eb8782bcf94c6db38b44610eca6f7fd4 Mon Sep 17 00:00:00 2001 From: synacker Date: Thu, 12 Sep 2024 00:03:39 +0300 Subject: [PATCH 33/36] Fix --- .github/workflows/daggy-github-actions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 53e70e75..5c4acef1 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -7,7 +7,7 @@ on: jobs: linux-gcc12_x64: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: From 326856e76f2984e4a33738d8cdaac0bca6c912fc Mon Sep 17 00:00:00 2001 From: synacker Date: Thu, 12 Sep 2024 00:13:32 +0300 Subject: [PATCH 34/36] Fix --- .github/workflows/daggy-github-actions.yaml | 2 -- git_version.py | 1 - 2 files changed, 3 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 5c4acef1..132d9fe2 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -10,8 +10,6 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Setup environment run: | diff --git a/git_version.py b/git_version.py index a5d4ba54..ed5b1d7e 100644 --- a/git_version.py +++ b/git_version.py @@ -56,7 +56,6 @@ def build(self): @property def branch(self): stream = os.popen("git branch --show-current") - return stream.read().strip() @property From 36e32a6a84a082d590c67e6af92b92aa86060e25 Mon Sep 17 00:00:00 2001 From: synacker Date: Thu, 12 Sep 2024 00:18:59 +0300 Subject: [PATCH 35/36] Fix --- .github/workflows/daggy-github-actions.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 132d9fe2..238f7310 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -10,6 +10,9 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 + with: + fetch-depth: 1 + fetch-tags: true - name: Setup environment run: | From 14498c4a926ae9f33747fe1b1a0ab1672b598925 Mon Sep 17 00:00:00 2001 From: synacker Date: Sun, 15 Sep 2024 15:44:51 +0300 Subject: [PATCH 36/36] Fix --- .github/workflows/daggy-github-actions.yaml | 3 +-- conanfile.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml index 238f7310..5c4acef1 100644 --- a/.github/workflows/daggy-github-actions.yaml +++ b/.github/workflows/daggy-github-actions.yaml @@ -11,8 +11,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - fetch-depth: 1 - fetch-tags: true + fetch-depth: 0 - name: Setup environment run: | diff --git a/conanfile.py b/conanfile.py index 039e95e5..19180cf0 100644 --- a/conanfile.py +++ b/conanfile.py @@ -51,7 +51,7 @@ class DaggyConan(ConanFile): _cmake = None def set_version(self): - self.version = GitVersion().standard + self.version = GitVersion().version def validate(self): check_min_cppstd(self, "17")