Merge pull request #187 from AntelopeIO/integration_tests_ci_main

[4.0 -> main] merge up #172 (CI integration tests), #182 (4.0 stable bump?)
AntelopeIO · May 31, 2023 · df628a1 · df628a1
2 parents 8671ca2 + 44379dc
commit df628a1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -67,12 +67,29 @@ jobs:
         - uses: actions/checkout@v3
           with:
             submodules: recursive
+        - name: Download leap-dev.deb (Ubuntu 20 only)
+          if: matrix.platform == 'ubuntu20'
+          uses: AntelopeIO/asset-artifact-download-action@v2
+          with:
+            owner: AntelopeIO
+            repo: leap
+            file: 'leap-dev.*(x86_64|amd64).deb'
+            target: 4.0
+            artifact-name: leap-dev-ubuntu20-amd64
+            container-package: experimental-binaries
+            token: ${{github.token}}
+        - name: Install leap-dev.deb (Ubuntu 20 only)
+          if: matrix.platform == 'ubuntu20'
+          run: |
+            apt-get update && apt-get upgrade -y
+            apt install -y ./leap-dev*.deb
+            rm ./leap-dev*.deb
         - name: Build & Test
           run: |
             mkdir build
             cd build
-            cmake -DCMAKE_BUILD_TYPE=Release -GNinja ..
-            ninja
+            cmake -DCMAKE_BUILD_TYPE=Release ..
+            make -j $(nproc)
             cd tests
             ctest -j $(nproc) --output-on-failure
         - name: Package (Ubuntu 18 only)

diff --git a/tools/external/antler-proj b/tools/external/antler-proj
+1 −1		.clang-format
+0 −16		.gitattributes
+0 −7		.githooks/pre-commit
+44 −68		docs/man/antler-proj.1
+36 −46		docs/man/antler-proj.1.md
+1 −1		include/CMakeLists.txt
+211 −210		include/antler/project/cmake.hpp
+34 −32		include/antler/project/dependency.hpp
+172 −170		include/antler/project/net_utils.hpp
+179 −178		include/antler/project/object.hpp
+86 −85		include/antler/project/populator.hpp
+28 −28		include/antler/project/project.hpp
+75 −75		include/antler/project/source.hpp
+22 −26		include/antler/project/version.hpp
+82 −84		include/antler/project/version_constraint.hpp
+67 −67		include/antler/project/yaml.hpp
+5 −5		include/antler/system/filesystem.hpp
+20 −20		include/antler/system/serialize.hpp
+183 −185		include/antler/system/utils.hpp
+13 −13		include/antler/system/version.hpp.in
+29 −35		src/CMakeLists.txt
+2 −2		src/cmake_templates.cpp
+14 −12		src/dependency.cpp
+12 −24		src/location.cpp
+15 −13		src/object.cpp
+11 −14		src/populator.cpp
+277 −279		src/project-parse.cpp
+27 −26		src/project-populate.cpp
+7 −13		src/project-print.cpp
+7 −6		src/project.cpp
+87 −84		src/version_constraint.cpp
+77 −77		tests/cmake_tests.cpp
+9 −15		tests/common.hpp
+3 −3		tests/dependency_tests.cpp
+29 −29		tests/init_tests.cpp
+2 −2		tests/main.cpp
+1 −1		tests/net_utils_tests.cpp
+22 −63		tests/object_tests.cpp
+20 −25		tests/project_tests.cpp
+2 −3		tests/version_constraint_tests.cpp
+89 −87		tests/version_tests.cpp
+7,623 −7,775		tools/CLI11.hpp
+237 −236		tools/add_to.hpp
+128 −125		tools/build.hpp
+50 −50		tools/common.hpp
+39 −41		tools/init.hpp
+107 −112		tools/main.cpp
+39 −37		tools/populate.hpp
+141 −133		tools/remove_from.hpp
+15 −50		tools/tests/add_and_update.py
+0 −19		tools/tests/init_tests.py
+3 −4		tools/tests/pandb_contract/apps/test/test.cpp
+7 −5		tools/tests/pandb_contract/include/test/test.hpp
+207 −197		tools/update.hpp
+45 −42		tools/validate.hpp