From 0a5d8cd7ee4f6a733f2a101e08db07f8ba4995ec Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:20:23 +0300 Subject: [PATCH 01/16] Time to test --- .gitea/workflows/ci.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .gitea/workflows/ci.yml diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml new file mode 100644 index 0000000..0c3a60b --- /dev/null +++ b/.gitea/workflows/ci.yml @@ -0,0 +1,32 @@ +name: CI & Unit Tests +run-name: CI & Unit Tests +on: [push, pull_request] + +jobs: + Unit-Tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Prepare environment + run: | + sudo apt install -y --no-install-recommends build-essential cmake ninja-build python3 python3-pip + pip3 install --user --upgrade conan==1.42.1 + conan profile new default --detect + conan profile update settings.compiler.libcxx=libstdc++11 default + + - name: Configure build + working-directory: ${{runner.workspace}} + run: | + cmake -Bbuild -H$GITHUB_WORKSPACE \ + -G"Ninja" \ + -DCMAKE_BUILD_TYPE=Release \ + -DWITH_TESTS=ON + + - name: Build tests + lib + working-directory: ${{runner.workspace}}/build + run: ninja + + - name: Run tests + working-directory: ${{runner.workspace}}/build + run: ctest . --output-on-failure -- 2.47.2 From a5d751893c8f4d45492509a1dc7d0419a6f490d5 Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:21:03 +0300 Subject: [PATCH 02/16] Sudo not necessary --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 0c3a60b..b2d2bcf 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: - name: Prepare environment run: | - sudo apt install -y --no-install-recommends build-essential cmake ninja-build python3 python3-pip + apt install -y --no-install-recommends build-essential cmake ninja-build python3 python3-pip pip3 install --user --upgrade conan==1.42.1 conan profile new default --detect conan profile update settings.compiler.libcxx=libstdc++11 default -- 2.47.2 From 842f82133397c47f3bdf189c5bc63f18ca51721f Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:21:44 +0300 Subject: [PATCH 03/16] Apt update necessary --- .gitea/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index b2d2bcf..8b96454 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -10,6 +10,7 @@ jobs: - name: Prepare environment run: | + apt update apt install -y --no-install-recommends build-essential cmake ninja-build python3 python3-pip pip3 install --user --upgrade conan==1.42.1 conan profile new default --detect -- 2.47.2 From ec6e3b71a28b60f56d5f0393af9db1ef276c247e Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:22:40 +0300 Subject: [PATCH 04/16] --user not necessary --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 8b96454..b5c3d33 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: run: | apt update apt install -y --no-install-recommends build-essential cmake ninja-build python3 python3-pip - pip3 install --user --upgrade conan==1.42.1 + pip3 install --upgrade conan==1.42.1 conan profile new default --detect conan profile update settings.compiler.libcxx=libstdc++11 default -- 2.47.2 From 6bb642360e454b38649ba36f8652cdbf7069f2ae Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:24:07 +0300 Subject: [PATCH 05/16] Altho we no longer use conan, ergo, remove --- .gitea/workflows/ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index b5c3d33..a43bd3d 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -11,10 +11,7 @@ jobs: - name: Prepare environment run: | apt update - apt install -y --no-install-recommends build-essential cmake ninja-build python3 python3-pip - pip3 install --upgrade conan==1.42.1 - conan profile new default --detect - conan profile update settings.compiler.libcxx=libstdc++11 default + apt install -y --no-install-recommends build-essential cmake ninja-build - name: Configure build working-directory: ${{runner.workspace}} -- 2.47.2 From 6166054d3f9f8435561efdc63d23c5b774e8d782 Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:25:36 +0300 Subject: [PATCH 06/16] Directory memery --- .gitea/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index a43bd3d..a4606cf 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,10 +16,11 @@ jobs: - name: Configure build working-directory: ${{runner.workspace}} run: | - cmake -Bbuild -H$GITHUB_WORKSPACE \ + cmake -B${{runner.workspace}}/build -H$GITHUB_WORKSPACE \ -G"Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_TESTS=ON + ls ${{runner.workspace}} - name: Build tests + lib working-directory: ${{runner.workspace}}/build -- 2.47.2 From 54a4ec029b98319529c9731a8825b3b42b371eb0 Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:29:20 +0300 Subject: [PATCH 07/16] woupsy dirs are bad --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index a4606cf..faadc85 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Configure build working-directory: ${{runner.workspace}} run: | - cmake -B${{runner.workspace}}/build -H$GITHUB_WORKSPACE \ + cmake ./Tests -Bbuild -H$GITHUB_WORKSPACE \ -G"Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_TESTS=ON -- 2.47.2 From 83bfbd8dc13f9715d2a6ec9e3202221e7da51ec0 Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:30:27 +0300 Subject: [PATCH 08/16] okay that was unfortunate --- .gitea/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index faadc85..e03519f 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,10 +16,10 @@ jobs: - name: Configure build working-directory: ${{runner.workspace}} run: | - cmake ./Tests -Bbuild -H$GITHUB_WORKSPACE \ + cmake . -Bbuild -H$GITHUB_WORKSPACE \ -G"Ninja" \ -DCMAKE_BUILD_TYPE=Release \ - -DWITH_TESTS=ON + -DSKULLC_WITH_TESTS=ON ls ${{runner.workspace}} - name: Build tests + lib -- 2.47.2 From b5c1259408e053750e4cd99470a78f6bef13b345 Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:31:25 +0300 Subject: [PATCH 09/16] Directories vol 4 --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index e03519f..1b9f1b9 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Configure build working-directory: ${{runner.workspace}} run: | - cmake . -Bbuild -H$GITHUB_WORKSPACE \ + cmake . -B${{runner.workspace}}/build -H$GITHUB_WORKSPACE \ -G"Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -DSKULLC_WITH_TESTS=ON -- 2.47.2 From 1e314e1088d1a20bfa9ea3e8b90293bf468e36e8 Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:33:19 +0300 Subject: [PATCH 10/16] Maybe better thsi way? --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 1b9f1b9..8486660 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Configure build working-directory: ${{runner.workspace}} run: | - cmake . -B${{runner.workspace}}/build -H$GITHUB_WORKSPACE \ + cmake . -Bbuild -H${{runner.workspace}} \ -G"Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -DSKULLC_WITH_TESTS=ON -- 2.47.2 From 3b75a1f3c1efd3164275aceed1fb2a6219f299eb Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:34:29 +0300 Subject: [PATCH 11/16] okay done --- .gitea/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 8486660..9016059 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,11 +16,10 @@ jobs: - name: Configure build working-directory: ${{runner.workspace}} run: | - cmake . -Bbuild -H${{runner.workspace}} \ + cmake . -B${{runner.workspace}}/build -H${{runner.workspace}} \ -G"Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -DSKULLC_WITH_TESTS=ON - ls ${{runner.workspace}} - name: Build tests + lib working-directory: ${{runner.workspace}}/build -- 2.47.2 From bcdcb934e9b3c2331cc522abbe4984cc410cab87 Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:40:35 +0300 Subject: [PATCH 12/16] Why did that break things? --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 9016059..a3eaf7c 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Configure build working-directory: ${{runner.workspace}} run: | - cmake . -B${{runner.workspace}}/build -H${{runner.workspace}} \ + cmake -S${{runner.workspace}} -B${{runner.workspace}}/build \ -G"Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -DSKULLC_WITH_TESTS=ON -- 2.47.2 From d68ca918faeefd92c0357884e9e5f737fa483814 Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:42:11 +0300 Subject: [PATCH 13/16] I give up, the old way it is --- .gitea/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index a3eaf7c..d9c8413 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,7 +16,9 @@ jobs: - name: Configure build working-directory: ${{runner.workspace}} run: | - cmake -S${{runner.workspace}} -B${{runner.workspace}}/build \ + mkdir build + cd build + cmake .. \ -G"Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -DSKULLC_WITH_TESTS=ON -- 2.47.2 From f4f0560eceb2520cb69067c171d725222e4483f0 Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:45:38 +0300 Subject: [PATCH 14/16] step 1 --- .gitea/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index d9c8413..5c02219 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,9 +16,7 @@ jobs: - name: Configure build working-directory: ${{runner.workspace}} run: | - mkdir build - cd build - cmake .. \ + cmake . -B${{runner.workspace}}/build -H$GITHUB_WORKSPACE \ -G"Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -DSKULLC_WITH_TESTS=ON -- 2.47.2 From f8bc3d223180c8f26730c01a30b607a70df38371 Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:46:22 +0300 Subject: [PATCH 15/16] Is this necessary? --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 5c02219..3a13f55 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Configure build working-directory: ${{runner.workspace}} run: | - cmake . -B${{runner.workspace}}/build -H$GITHUB_WORKSPACE \ + cmake . -B${{runner.workspace}}/build \ -G"Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -DSKULLC_WITH_TESTS=ON -- 2.47.2 From 57b5590553949b055591e66e9e068aead84a4f59 Mon Sep 17 00:00:00 2001 From: erki Date: Mon, 15 May 2023 23:51:59 +0300 Subject: [PATCH 16/16] Delete old CI integrations --- .drone.yml | 28 ---------------------------- Jenkinsfile | 50 -------------------------------------------------- conanfile.txt | 5 ----- 3 files changed, 83 deletions(-) delete mode 100644 .drone.yml delete mode 100644 Jenkinsfile delete mode 100644 conanfile.txt diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 8459a83..0000000 --- a/.drone.yml +++ /dev/null @@ -1,28 +0,0 @@ -kind: pipeline -type: docker -name: default - -steps: - - name: build and test - pull: never - image: erki/cpp-ubuntu:latest - commands: - - mkdir -p build - - cd build - - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=ON - - ninja - - ctest . --output-on-failure - - name: notify - image: plugins/matrix - settings: - homeserver: - from_secret: matrix_homeserver - roomid: - from_secret: matrix_roomid - username: - from_secret: matrix_username - password: - from_secret: matrix_password - when: - status: - - failure \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index a5e0ff9..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,50 +0,0 @@ -pipeline { - agent { - label 'ubuntu' - } - - stages { - stage("build && test") { - steps { - echo "Workspace: ${env.WORKSPACE}" - sh 'mkdir -p build' - - dir("build") { - sh 'ls' - sh 'cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DSKULLC_WITH_TESTS=ON' - sh 'ninja' - sh 'ctest . -T test --output-on-failure --no-compress-output' - } - } - } - } - - post { - always { - archiveArtifacts ( - artifacts: 'build/Testing/**/*.xml', - fingerprint: true - ) - - // Process the CTest xml output with the xUnit plugin - xunit ( - testTimeMargin: '3000', - thresholdMode: 1, - thresholds: [ - skipped(failureThreshold: '0'), - failed(failureThreshold: '0') - ], - tools: [CTest( - pattern: 'build/Testing/**/*.xml', - deleteOutputFiles: true, - failIfNotNew: false, - skipNoTestFiles: true, - stopProcessingIfError: true - )] - ) - - // Clear the source and build dirs before next run - deleteDir() - } - } -} diff --git a/conanfile.txt b/conanfile.txt deleted file mode 100644 index e13ae86..0000000 --- a/conanfile.txt +++ /dev/null @@ -1,5 +0,0 @@ -[requires] -catch2/[>=2.0.0,<3.0.0] - -[generators] -cmake_find_package \ No newline at end of file -- 2.47.2