From d3c4658ea5319da3725a440e4dee2b4abe62bcb8 Mon Sep 17 00:00:00 2001 From: memsharded Date: Mon, 8 Feb 2021 23:48:16 +0100 Subject: [PATCH 1/4] failing case --- .../lockfiles/ci_build_require/.gitignore | 2 + .../ci_build_require/app1/conanfile.py | 8 ++ .../ci_build_require/app2/conanfile.py | 8 ++ .../lockfiles/ci_build_require/bo_debug.json | 18 +++ .../ci_build_require/bo_release.json | 18 +++ features/lockfiles/ci_build_require/build.bat | 1 + features/lockfiles/ci_build_require/build.py | 124 ++++++++++++++++++ features/lockfiles/ci_build_require/build.sh | 5 + .../ci_build_require/liba/conanfile.py | 6 + .../ci_build_require/libb/conanfile.py | 8 ++ .../ci_build_require/libc/conanfile.py | 7 + .../ci_build_require/libd/conanfile.py | 8 ++ .../ci_build_require/locks/app1_base.lock | 41 ++++++ .../ci_build_require/locks/app1_debug.lock | 55 ++++++++ .../ci_build_require/locks/app1_release.lock | 55 ++++++++ .../ci_build_require/locks/libb_base.lock | 19 +++ .../locks/libb_deps_base.lock | 20 +++ .../locks/libb_deps_debug.lock | 43 ++++++ .../locks/libb_deps_release.lock | 43 ++++++ features/lockfiles/ci_build_require/profile | 3 + .../ci_build_require/tool/conanfile.py | 6 + 21 files changed, 498 insertions(+) create mode 100644 features/lockfiles/ci_build_require/.gitignore create mode 100644 features/lockfiles/ci_build_require/app1/conanfile.py create mode 100644 features/lockfiles/ci_build_require/app2/conanfile.py create mode 100644 features/lockfiles/ci_build_require/bo_debug.json create mode 100644 features/lockfiles/ci_build_require/bo_release.json create mode 100644 features/lockfiles/ci_build_require/build.bat create mode 100644 features/lockfiles/ci_build_require/build.py create mode 100644 features/lockfiles/ci_build_require/build.sh create mode 100644 features/lockfiles/ci_build_require/liba/conanfile.py create mode 100644 features/lockfiles/ci_build_require/libb/conanfile.py create mode 100644 features/lockfiles/ci_build_require/libc/conanfile.py create mode 100644 features/lockfiles/ci_build_require/libd/conanfile.py create mode 100644 features/lockfiles/ci_build_require/locks/app1_base.lock create mode 100644 features/lockfiles/ci_build_require/locks/app1_debug.lock create mode 100644 features/lockfiles/ci_build_require/locks/app1_release.lock create mode 100644 features/lockfiles/ci_build_require/locks/libb_base.lock create mode 100644 features/lockfiles/ci_build_require/locks/libb_deps_base.lock create mode 100644 features/lockfiles/ci_build_require/locks/libb_deps_debug.lock create mode 100644 features/lockfiles/ci_build_require/locks/libb_deps_release.lock create mode 100644 features/lockfiles/ci_build_require/profile create mode 100644 features/lockfiles/ci_build_require/tool/conanfile.py diff --git a/features/lockfiles/ci_build_require/.gitignore b/features/lockfiles/ci_build_require/.gitignore new file mode 100644 index 00000000..3fc3532b --- /dev/null +++ b/features/lockfiles/ci_build_require/.gitignore @@ -0,0 +1,2 @@ +release/ +bo.json \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/app1/conanfile.py b/features/lockfiles/ci_build_require/app1/conanfile.py new file mode 100644 index 00000000..7b434ceb --- /dev/null +++ b/features/lockfiles/ci_build_require/app1/conanfile.py @@ -0,0 +1,8 @@ + +from conans import ConanFile + +required_conan_version = ">=1.28" + +class App1Conan(ConanFile): + settings = "build_type" + requires = "libd/[>0.0 <1.0]@user/testing" diff --git a/features/lockfiles/ci_build_require/app2/conanfile.py b/features/lockfiles/ci_build_require/app2/conanfile.py new file mode 100644 index 00000000..1c905a99 --- /dev/null +++ b/features/lockfiles/ci_build_require/app2/conanfile.py @@ -0,0 +1,8 @@ + +from conans import ConanFile + +required_conan_version = ">=1.28" + +class App2Conan(ConanFile): + settings = "build_type" + requires = "libc/[>0.0 <1.0]@user/testing" diff --git a/features/lockfiles/ci_build_require/bo_debug.json b/features/lockfiles/ci_build_require/bo_debug.json new file mode 100644 index 00000000..1f399ee2 --- /dev/null +++ b/features/lockfiles/ci_build_require/bo_debug.json @@ -0,0 +1,18 @@ +[ + [ + [ + "libd/0.1@user/testing", + "67a26cfbef78ad4905bec085664768c209d14fda", + "host", + "4" + ] + ], + [ + [ + "app1/0.1@user/testing", + "680239a70c97f93d4d3dba4dec1b148d45ed087a", + "host", + "3" + ] + ] +] \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/bo_release.json b/features/lockfiles/ci_build_require/bo_release.json new file mode 100644 index 00000000..85867849 --- /dev/null +++ b/features/lockfiles/ci_build_require/bo_release.json @@ -0,0 +1,18 @@ +[ + [ + [ + "libd/0.1@user/testing", + "b03c813b34cfab7a095fd903f7e8df2114e2b858", + "host", + "4" + ] + ], + [ + [ + "app1/0.1@user/testing", + "15d2c695ed8d421c0d8932501fc654c8083e6582", + "host", + "3" + ] + ] +] \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/build.bat b/features/lockfiles/ci_build_require/build.bat new file mode 100644 index 00000000..f64fcd65 --- /dev/null +++ b/features/lockfiles/ci_build_require/build.bat @@ -0,0 +1 @@ +python build.py \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/build.py b/features/lockfiles/ci_build_require/build.py new file mode 100644 index 00000000..8f93abb0 --- /dev/null +++ b/features/lockfiles/ci_build_require/build.py @@ -0,0 +1,124 @@ +import os, json, shutil +import subprocess +from contextlib import contextmanager + + +def run(cmd, assert_error=False): + print("*********** Running: %s" % cmd) + ret = os.system(cmd) + if ret == 0 and assert_error: + raise Exception("Command unexpectedly succedeed: %s" % cmd) + if ret != 0 and not assert_error: + raise Exception("Failed command: %s" % cmd) + +def load(filename): + with open(filename, "r") as f: + return f.read() + +def save(filename, content): + with open(filename, "w") as f: + return f.write(content) + + +def rm(path): + if os.path.isfile(path): + os.remove(path) + elif os.path.isdir(path): + shutil.rmtree(path) + +@contextmanager +def chdir(path): + current_path = os.getcwd() + try: + os.chdir(path) + yield + finally: + os.chdir(current_path) + +@contextmanager +def setenv(key, value): + old_value = os.environ.get(key) + os.environ[key] = value + try: + yield + finally: + if old_value is not None: + os.environ[key] = old_value + + +def clean(): + rm("tmp") + rm("locks") + rm("bo_release.json") + rm("bo_debug.json") + + +def ci_pipeline(): + clean() + run("conan config set general.default_package_id_mode=full_version_mode") + for config in ("Release", "Debug"): + run("conan create tool tool1/0.1@user/testing -s build_type=%s" % config) + run("conan create tool tool2/0.1@user/testing -s build_type=%s" % config) + run("conan create liba liba/0.1@user/testing -s build_type=%s" % config) + run("conan create libb libb/0.1@user/testing -s build_type=%s" % config) + run("conan create libc libc/0.1@user/testing -s build_type=%s" % config) + run("conan create libd libd/0.1@user/testing -s build_type=%s" % config) + run("conan create app1 app1/0.1@user/testing -s build_type=%s" % config) + run("conan create app2 app2/0.1@user/testing -s build_type=%s" % config) + + # A developer does some change to the libb + with chdir("libb"): + libb = load("conanfile.py") + libb = libb + "# Some changes" + save("conanfile.py", libb) + + run("conan lock create conanfile.py --name=libb --version=0.2 " + "--user=user --channel=testing --lockfile-out=../locks/libb_deps_base.lock --base") + + # Even if liba gets a new 0.2 version, the lockfile will avoid it + run("conan create liba liba/0.2@user/testing") + with chdir("libb"): + # This will be useful to capture the revision + run("conan export . libb/0.2@user/testing --lockfile=../locks/libb_deps_base.lock " + "--lockfile-out=../locks/libb_base.lock") + print(load("../locks/libb_base.lock")) + # Capture the configuration lockfiles, one per configuration + run("conan lock create conanfile.py --name=libb --version=0.2 --profile=../profile -s build_type=Debug " + "--user=user --channel=testing --lockfile=../locks/libb_base.lock --lockfile-out=../locks/libb_deps_debug.lock") + run("conan lock create conanfile.py --name=libb --version=0.2 --profile=../profile -s build_type=Release " + "--user=user --channel=testing --lockfile=../locks/libb_base.lock --lockfile-out=../locks/libb_deps_release.lock") + print(load("../locks/libb_deps_release.lock")) + print(load("../locks/libb_deps_debug.lock")) + # Now build libb + run("conan create . libb/0.2@user/testing --lockfile=../locks/libb_deps_release.lock") + run("conan create . libb/0.2@user/testing --lockfile=../locks/libb_deps_debug.lock") + + # Capture the app1 base lockfile + run("conan lock create --reference=app1/0.1@user/testing --lockfile=locks/libb_base.lock " + "--lockfile-out=locks/app1_base.lock --base") + # And one lockfile per configuration + run("conan lock create --reference=app1/0.1@user/testing --lockfile=locks/app1_base.lock " + "--lockfile-out=locks/app1_release.lock -s build_type=Release --profile=profile") + run("conan lock create --reference=app1/0.1@user/testing --lockfile=locks/app1_base.lock " + "--lockfile-out=locks/app1_debug.lock -s build_type=Debug --profile=profile") + + run("conan lock build-order locks/app1_release.lock --json=bo_release.json") + run("conan lock build-order locks/app1_debug.lock --json=bo_debug.json") + build_order_release = json.loads(load("bo_release.json")) + build_order_debug = json.loads(load("bo_debug.json")) + + for level in build_order_release: + for item in level: + ref, pid, context, id_ = item + print(item) + run("conan install %s --build=%s --lockfile=locks/app1_release.lock " + "--lockfile-out=locks/app1_release_updated.lock" % (ref, ref)) + run("conan lock update locks/app1_release.lock locks/app1_release_updated.lock") + + print(load("locks/app1_release.lock")) + clean() + +if __name__ == '__main__': + home = os.path.abspath(os.path.join(os.path.dirname(__file__), "tmp")) + with setenv("CONAN_USER_HOME", home): + ci_pipeline() diff --git a/features/lockfiles/ci_build_require/build.sh b/features/lockfiles/ci_build_require/build.sh new file mode 100644 index 00000000..421641ed --- /dev/null +++ b/features/lockfiles/ci_build_require/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +set -ex + +python build.py diff --git a/features/lockfiles/ci_build_require/liba/conanfile.py b/features/lockfiles/ci_build_require/liba/conanfile.py new file mode 100644 index 00000000..040b059a --- /dev/null +++ b/features/lockfiles/ci_build_require/liba/conanfile.py @@ -0,0 +1,6 @@ +from conans import ConanFile, tools + +required_conan_version = ">=1.28.0" + +class PkgaConan(ConanFile): + settings = "build_type" diff --git a/features/lockfiles/ci_build_require/libb/conanfile.py b/features/lockfiles/ci_build_require/libb/conanfile.py new file mode 100644 index 00000000..ce53dbde --- /dev/null +++ b/features/lockfiles/ci_build_require/libb/conanfile.py @@ -0,0 +1,8 @@ +from conans import ConanFile + +required_conan_version = ">=1.28" + +class LibBConan(ConanFile): + settings = "build_type" + requires = "liba/[>0.0 <1.0]@user/testing" +# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/libc/conanfile.py b/features/lockfiles/ci_build_require/libc/conanfile.py new file mode 100644 index 00000000..19335859 --- /dev/null +++ b/features/lockfiles/ci_build_require/libc/conanfile.py @@ -0,0 +1,7 @@ +from conans import ConanFile + +required_conan_version = ">=1.28" + +class LibCConan(ConanFile): + settings = "build_type" + requires = "liba/[>0.0 <1.0]@user/testing" diff --git a/features/lockfiles/ci_build_require/libd/conanfile.py b/features/lockfiles/ci_build_require/libd/conanfile.py new file mode 100644 index 00000000..bfef28b1 --- /dev/null +++ b/features/lockfiles/ci_build_require/libd/conanfile.py @@ -0,0 +1,8 @@ + +from conans import ConanFile + +required_conan_version = ">=1.28" + +class LibDConan(ConanFile): + settings = "build_type" + requires = "libb/[>0.0 <1.0]@user/testing", "libc/[>0.0 <1.0]@user/testing" diff --git a/features/lockfiles/ci_build_require/locks/app1_base.lock b/features/lockfiles/ci_build_require/locks/app1_base.lock new file mode 100644 index 00000000..bddcfdf9 --- /dev/null +++ b/features/lockfiles/ci_build_require/locks/app1_base.lock @@ -0,0 +1,41 @@ +{ + "graph_lock": { + "nodes": { + "0": { + "ref": "libb/0.2@user/testing", + "requires": [ + "1" + ], + "context": "host" + }, + "1": { + "ref": "liba/0.1@user/testing", + "context": "host" + }, + "3": { + "ref": "app1/0.1@user/testing", + "requires": [ + "4" + ], + "context": "host" + }, + "4": { + "ref": "libd/0.1@user/testing", + "requires": [ + "0", + "5" + ], + "context": "host" + }, + "5": { + "ref": "libc/0.1@user/testing", + "requires": [ + "1" + ], + "context": "host" + } + }, + "revisions_enabled": false + }, + "version": "0.4" +} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/app1_debug.lock b/features/lockfiles/ci_build_require/locks/app1_debug.lock new file mode 100644 index 00000000..c623fa7a --- /dev/null +++ b/features/lockfiles/ci_build_require/locks/app1_debug.lock @@ -0,0 +1,55 @@ +{ + "graph_lock": { + "nodes": { + "0": { + "ref": "libb/0.2@user/testing", + "options": "", + "package_id": "281a7e3eaa861ca65ad8f566ded8fc8b48206913", + "prev": "0", + "requires": [ + "1" + ], + "context": "host" + }, + "1": { + "ref": "liba/0.1@user/testing", + "options": "", + "package_id": "5a67a79dbc25fd0fa149a0eb7a20715189a0d988", + "prev": "0", + "context": "host" + }, + "3": { + "ref": "app1/0.1@user/testing", + "options": "", + "package_id": "680239a70c97f93d4d3dba4dec1b148d45ed087a", + "requires": [ + "4" + ], + "context": "host" + }, + "4": { + "ref": "libd/0.1@user/testing", + "options": "", + "package_id": "67a26cfbef78ad4905bec085664768c209d14fda", + "requires": [ + "0", + "5" + ], + "context": "host" + }, + "5": { + "ref": "libc/0.1@user/testing", + "options": "", + "package_id": "281a7e3eaa861ca65ad8f566ded8fc8b48206913", + "prev": "0", + "requires": [ + "1" + ], + "context": "host" + } + }, + "revisions_enabled": false + }, + "version": "0.4", + "profile_host": "[settings]\nbuild_type=Debug\n[options]\n[build_requires]\n*: tool1/0.1@user/testing, tool2/0.1@user/testing\n[env]\n" +} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/app1_release.lock b/features/lockfiles/ci_build_require/locks/app1_release.lock new file mode 100644 index 00000000..4d4cea08 --- /dev/null +++ b/features/lockfiles/ci_build_require/locks/app1_release.lock @@ -0,0 +1,55 @@ +{ + "graph_lock": { + "nodes": { + "0": { + "ref": "libb/0.2@user/testing", + "options": "", + "package_id": "39b0b5fad32aaf2a462d27d4282d12c08bd6c818", + "prev": "0", + "requires": [ + "1" + ], + "context": "host" + }, + "1": { + "ref": "liba/0.1@user/testing", + "options": "", + "package_id": "4024617540c4f240a6a5e8911b0de9ef38a11a72", + "prev": "0", + "context": "host" + }, + "3": { + "ref": "app1/0.1@user/testing", + "options": "", + "package_id": "15d2c695ed8d421c0d8932501fc654c8083e6582", + "requires": [ + "4" + ], + "context": "host" + }, + "4": { + "ref": "libd/0.1@user/testing", + "options": "", + "package_id": "b03c813b34cfab7a095fd903f7e8df2114e2b858", + "requires": [ + "0", + "5" + ], + "context": "host" + }, + "5": { + "ref": "libc/0.1@user/testing", + "options": "", + "package_id": "39b0b5fad32aaf2a462d27d4282d12c08bd6c818", + "prev": "0", + "requires": [ + "1" + ], + "context": "host" + } + }, + "revisions_enabled": false + }, + "version": "0.4", + "profile_host": "[settings]\nbuild_type=Release\n[options]\n[build_requires]\n*: tool1/0.1@user/testing, tool2/0.1@user/testing\n[env]\n" +} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/libb_base.lock b/features/lockfiles/ci_build_require/locks/libb_base.lock new file mode 100644 index 00000000..a5687ae5 --- /dev/null +++ b/features/lockfiles/ci_build_require/locks/libb_base.lock @@ -0,0 +1,19 @@ +{ + "graph_lock": { + "nodes": { + "0": { + "ref": "libb/0.2@user/testing", + "requires": [ + "1" + ], + "context": "host" + }, + "1": { + "ref": "liba/0.1@user/testing", + "context": "host" + } + }, + "revisions_enabled": false + }, + "version": "0.4" +} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/libb_deps_base.lock b/features/lockfiles/ci_build_require/locks/libb_deps_base.lock new file mode 100644 index 00000000..77c91ed4 --- /dev/null +++ b/features/lockfiles/ci_build_require/locks/libb_deps_base.lock @@ -0,0 +1,20 @@ +{ + "graph_lock": { + "nodes": { + "0": { + "ref": "libb/0.2@user/testing", + "requires": [ + "1" + ], + "path": "..\\libb\\conanfile.py", + "context": "host" + }, + "1": { + "ref": "liba/0.1@user/testing", + "context": "host" + } + }, + "revisions_enabled": false + }, + "version": "0.4" +} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/libb_deps_debug.lock b/features/lockfiles/ci_build_require/locks/libb_deps_debug.lock new file mode 100644 index 00000000..1be657b7 --- /dev/null +++ b/features/lockfiles/ci_build_require/locks/libb_deps_debug.lock @@ -0,0 +1,43 @@ +{ + "graph_lock": { + "nodes": { + "0": { + "ref": "libb/0.2@user/testing", + "options": "", + "requires": [ + "1" + ], + "build_requires": [ + "2", + "3" + ], + "path": "..\\libb\\conanfile.py", + "context": "host" + }, + "1": { + "ref": "liba/0.1@user/testing", + "options": "", + "package_id": "5a67a79dbc25fd0fa149a0eb7a20715189a0d988", + "prev": "0", + "context": "host" + }, + "2": { + "ref": "tool1/0.1@user/testing", + "options": "", + "package_id": "5a67a79dbc25fd0fa149a0eb7a20715189a0d988", + "prev": "0", + "context": "host" + }, + "3": { + "ref": "tool2/0.1@user/testing", + "options": "", + "package_id": "5a67a79dbc25fd0fa149a0eb7a20715189a0d988", + "prev": "0", + "context": "host" + } + }, + "revisions_enabled": false + }, + "version": "0.4", + "profile_host": "[settings]\nbuild_type=Debug\n[options]\n[build_requires]\n*: tool1/0.1@user/testing, tool2/0.1@user/testing\n[env]\n" +} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/libb_deps_release.lock b/features/lockfiles/ci_build_require/locks/libb_deps_release.lock new file mode 100644 index 00000000..b8c7ce72 --- /dev/null +++ b/features/lockfiles/ci_build_require/locks/libb_deps_release.lock @@ -0,0 +1,43 @@ +{ + "graph_lock": { + "nodes": { + "0": { + "ref": "libb/0.2@user/testing", + "options": "", + "requires": [ + "1" + ], + "build_requires": [ + "2", + "3" + ], + "path": "..\\libb\\conanfile.py", + "context": "host" + }, + "1": { + "ref": "liba/0.1@user/testing", + "options": "", + "package_id": "4024617540c4f240a6a5e8911b0de9ef38a11a72", + "prev": "0", + "context": "host" + }, + "2": { + "ref": "tool1/0.1@user/testing", + "options": "", + "package_id": "4024617540c4f240a6a5e8911b0de9ef38a11a72", + "prev": "0", + "context": "host" + }, + "3": { + "ref": "tool2/0.1@user/testing", + "options": "", + "package_id": "4024617540c4f240a6a5e8911b0de9ef38a11a72", + "prev": "0", + "context": "host" + } + }, + "revisions_enabled": false + }, + "version": "0.4", + "profile_host": "[settings]\nbuild_type=Release\n[options]\n[build_requires]\n*: tool1/0.1@user/testing, tool2/0.1@user/testing\n[env]\n" +} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/profile b/features/lockfiles/ci_build_require/profile new file mode 100644 index 00000000..7bc5aec0 --- /dev/null +++ b/features/lockfiles/ci_build_require/profile @@ -0,0 +1,3 @@ +[build_requires] +tool1/0.1@user/testing +tool2/0.1@user/testing diff --git a/features/lockfiles/ci_build_require/tool/conanfile.py b/features/lockfiles/ci_build_require/tool/conanfile.py new file mode 100644 index 00000000..08311b38 --- /dev/null +++ b/features/lockfiles/ci_build_require/tool/conanfile.py @@ -0,0 +1,6 @@ +from conans import ConanFile + +required_conan_version = ">=1.28.0" + +class PkgaConan(ConanFile): + settings = "build_type" From a6dfcd51f0c5eb5b67adbc4f2cffc0a16c79d8e5 Mon Sep 17 00:00:00 2001 From: memsharded Date: Mon, 8 Feb 2021 23:49:59 +0100 Subject: [PATCH 2/4] working --- .../lockfiles/ci_build_require/bo_debug.json | 18 ------ .../ci_build_require/bo_release.json | 18 ------ .../ci_build_require/locks/app1_base.lock | 41 -------------- .../ci_build_require/locks/app1_debug.lock | 55 ------------------- .../ci_build_require/locks/app1_release.lock | 55 ------------------- .../ci_build_require/locks/libb_base.lock | 19 ------- .../locks/libb_deps_base.lock | 20 ------- .../locks/libb_deps_debug.lock | 43 --------------- .../locks/libb_deps_release.lock | 43 --------------- 9 files changed, 312 deletions(-) delete mode 100644 features/lockfiles/ci_build_require/bo_debug.json delete mode 100644 features/lockfiles/ci_build_require/bo_release.json delete mode 100644 features/lockfiles/ci_build_require/locks/app1_base.lock delete mode 100644 features/lockfiles/ci_build_require/locks/app1_debug.lock delete mode 100644 features/lockfiles/ci_build_require/locks/app1_release.lock delete mode 100644 features/lockfiles/ci_build_require/locks/libb_base.lock delete mode 100644 features/lockfiles/ci_build_require/locks/libb_deps_base.lock delete mode 100644 features/lockfiles/ci_build_require/locks/libb_deps_debug.lock delete mode 100644 features/lockfiles/ci_build_require/locks/libb_deps_release.lock diff --git a/features/lockfiles/ci_build_require/bo_debug.json b/features/lockfiles/ci_build_require/bo_debug.json deleted file mode 100644 index 1f399ee2..00000000 --- a/features/lockfiles/ci_build_require/bo_debug.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - [ - [ - "libd/0.1@user/testing", - "67a26cfbef78ad4905bec085664768c209d14fda", - "host", - "4" - ] - ], - [ - [ - "app1/0.1@user/testing", - "680239a70c97f93d4d3dba4dec1b148d45ed087a", - "host", - "3" - ] - ] -] \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/bo_release.json b/features/lockfiles/ci_build_require/bo_release.json deleted file mode 100644 index 85867849..00000000 --- a/features/lockfiles/ci_build_require/bo_release.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - [ - [ - "libd/0.1@user/testing", - "b03c813b34cfab7a095fd903f7e8df2114e2b858", - "host", - "4" - ] - ], - [ - [ - "app1/0.1@user/testing", - "15d2c695ed8d421c0d8932501fc654c8083e6582", - "host", - "3" - ] - ] -] \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/app1_base.lock b/features/lockfiles/ci_build_require/locks/app1_base.lock deleted file mode 100644 index bddcfdf9..00000000 --- a/features/lockfiles/ci_build_require/locks/app1_base.lock +++ /dev/null @@ -1,41 +0,0 @@ -{ - "graph_lock": { - "nodes": { - "0": { - "ref": "libb/0.2@user/testing", - "requires": [ - "1" - ], - "context": "host" - }, - "1": { - "ref": "liba/0.1@user/testing", - "context": "host" - }, - "3": { - "ref": "app1/0.1@user/testing", - "requires": [ - "4" - ], - "context": "host" - }, - "4": { - "ref": "libd/0.1@user/testing", - "requires": [ - "0", - "5" - ], - "context": "host" - }, - "5": { - "ref": "libc/0.1@user/testing", - "requires": [ - "1" - ], - "context": "host" - } - }, - "revisions_enabled": false - }, - "version": "0.4" -} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/app1_debug.lock b/features/lockfiles/ci_build_require/locks/app1_debug.lock deleted file mode 100644 index c623fa7a..00000000 --- a/features/lockfiles/ci_build_require/locks/app1_debug.lock +++ /dev/null @@ -1,55 +0,0 @@ -{ - "graph_lock": { - "nodes": { - "0": { - "ref": "libb/0.2@user/testing", - "options": "", - "package_id": "281a7e3eaa861ca65ad8f566ded8fc8b48206913", - "prev": "0", - "requires": [ - "1" - ], - "context": "host" - }, - "1": { - "ref": "liba/0.1@user/testing", - "options": "", - "package_id": "5a67a79dbc25fd0fa149a0eb7a20715189a0d988", - "prev": "0", - "context": "host" - }, - "3": { - "ref": "app1/0.1@user/testing", - "options": "", - "package_id": "680239a70c97f93d4d3dba4dec1b148d45ed087a", - "requires": [ - "4" - ], - "context": "host" - }, - "4": { - "ref": "libd/0.1@user/testing", - "options": "", - "package_id": "67a26cfbef78ad4905bec085664768c209d14fda", - "requires": [ - "0", - "5" - ], - "context": "host" - }, - "5": { - "ref": "libc/0.1@user/testing", - "options": "", - "package_id": "281a7e3eaa861ca65ad8f566ded8fc8b48206913", - "prev": "0", - "requires": [ - "1" - ], - "context": "host" - } - }, - "revisions_enabled": false - }, - "version": "0.4", - "profile_host": "[settings]\nbuild_type=Debug\n[options]\n[build_requires]\n*: tool1/0.1@user/testing, tool2/0.1@user/testing\n[env]\n" -} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/app1_release.lock b/features/lockfiles/ci_build_require/locks/app1_release.lock deleted file mode 100644 index 4d4cea08..00000000 --- a/features/lockfiles/ci_build_require/locks/app1_release.lock +++ /dev/null @@ -1,55 +0,0 @@ -{ - "graph_lock": { - "nodes": { - "0": { - "ref": "libb/0.2@user/testing", - "options": "", - "package_id": "39b0b5fad32aaf2a462d27d4282d12c08bd6c818", - "prev": "0", - "requires": [ - "1" - ], - "context": "host" - }, - "1": { - "ref": "liba/0.1@user/testing", - "options": "", - "package_id": "4024617540c4f240a6a5e8911b0de9ef38a11a72", - "prev": "0", - "context": "host" - }, - "3": { - "ref": "app1/0.1@user/testing", - "options": "", - "package_id": "15d2c695ed8d421c0d8932501fc654c8083e6582", - "requires": [ - "4" - ], - "context": "host" - }, - "4": { - "ref": "libd/0.1@user/testing", - "options": "", - "package_id": "b03c813b34cfab7a095fd903f7e8df2114e2b858", - "requires": [ - "0", - "5" - ], - "context": "host" - }, - "5": { - "ref": "libc/0.1@user/testing", - "options": "", - "package_id": "39b0b5fad32aaf2a462d27d4282d12c08bd6c818", - "prev": "0", - "requires": [ - "1" - ], - "context": "host" - } - }, - "revisions_enabled": false - }, - "version": "0.4", - "profile_host": "[settings]\nbuild_type=Release\n[options]\n[build_requires]\n*: tool1/0.1@user/testing, tool2/0.1@user/testing\n[env]\n" -} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/libb_base.lock b/features/lockfiles/ci_build_require/locks/libb_base.lock deleted file mode 100644 index a5687ae5..00000000 --- a/features/lockfiles/ci_build_require/locks/libb_base.lock +++ /dev/null @@ -1,19 +0,0 @@ -{ - "graph_lock": { - "nodes": { - "0": { - "ref": "libb/0.2@user/testing", - "requires": [ - "1" - ], - "context": "host" - }, - "1": { - "ref": "liba/0.1@user/testing", - "context": "host" - } - }, - "revisions_enabled": false - }, - "version": "0.4" -} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/libb_deps_base.lock b/features/lockfiles/ci_build_require/locks/libb_deps_base.lock deleted file mode 100644 index 77c91ed4..00000000 --- a/features/lockfiles/ci_build_require/locks/libb_deps_base.lock +++ /dev/null @@ -1,20 +0,0 @@ -{ - "graph_lock": { - "nodes": { - "0": { - "ref": "libb/0.2@user/testing", - "requires": [ - "1" - ], - "path": "..\\libb\\conanfile.py", - "context": "host" - }, - "1": { - "ref": "liba/0.1@user/testing", - "context": "host" - } - }, - "revisions_enabled": false - }, - "version": "0.4" -} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/libb_deps_debug.lock b/features/lockfiles/ci_build_require/locks/libb_deps_debug.lock deleted file mode 100644 index 1be657b7..00000000 --- a/features/lockfiles/ci_build_require/locks/libb_deps_debug.lock +++ /dev/null @@ -1,43 +0,0 @@ -{ - "graph_lock": { - "nodes": { - "0": { - "ref": "libb/0.2@user/testing", - "options": "", - "requires": [ - "1" - ], - "build_requires": [ - "2", - "3" - ], - "path": "..\\libb\\conanfile.py", - "context": "host" - }, - "1": { - "ref": "liba/0.1@user/testing", - "options": "", - "package_id": "5a67a79dbc25fd0fa149a0eb7a20715189a0d988", - "prev": "0", - "context": "host" - }, - "2": { - "ref": "tool1/0.1@user/testing", - "options": "", - "package_id": "5a67a79dbc25fd0fa149a0eb7a20715189a0d988", - "prev": "0", - "context": "host" - }, - "3": { - "ref": "tool2/0.1@user/testing", - "options": "", - "package_id": "5a67a79dbc25fd0fa149a0eb7a20715189a0d988", - "prev": "0", - "context": "host" - } - }, - "revisions_enabled": false - }, - "version": "0.4", - "profile_host": "[settings]\nbuild_type=Debug\n[options]\n[build_requires]\n*: tool1/0.1@user/testing, tool2/0.1@user/testing\n[env]\n" -} \ No newline at end of file diff --git a/features/lockfiles/ci_build_require/locks/libb_deps_release.lock b/features/lockfiles/ci_build_require/locks/libb_deps_release.lock deleted file mode 100644 index b8c7ce72..00000000 --- a/features/lockfiles/ci_build_require/locks/libb_deps_release.lock +++ /dev/null @@ -1,43 +0,0 @@ -{ - "graph_lock": { - "nodes": { - "0": { - "ref": "libb/0.2@user/testing", - "options": "", - "requires": [ - "1" - ], - "build_requires": [ - "2", - "3" - ], - "path": "..\\libb\\conanfile.py", - "context": "host" - }, - "1": { - "ref": "liba/0.1@user/testing", - "options": "", - "package_id": "4024617540c4f240a6a5e8911b0de9ef38a11a72", - "prev": "0", - "context": "host" - }, - "2": { - "ref": "tool1/0.1@user/testing", - "options": "", - "package_id": "4024617540c4f240a6a5e8911b0de9ef38a11a72", - "prev": "0", - "context": "host" - }, - "3": { - "ref": "tool2/0.1@user/testing", - "options": "", - "package_id": "4024617540c4f240a6a5e8911b0de9ef38a11a72", - "prev": "0", - "context": "host" - } - }, - "revisions_enabled": false - }, - "version": "0.4", - "profile_host": "[settings]\nbuild_type=Release\n[options]\n[build_requires]\n*: tool1/0.1@user/testing, tool2/0.1@user/testing\n[env]\n" -} \ No newline at end of file From 1e0f0f488e51e8bb395b43cc25ec3732aaa3a559 Mon Sep 17 00:00:00 2001 From: memsharded Date: Mon, 8 Feb 2021 23:50:28 +0100 Subject: [PATCH 3/4] working in failure --- features/lockfiles/ci_build_require/.gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/features/lockfiles/ci_build_require/.gitignore b/features/lockfiles/ci_build_require/.gitignore index 3fc3532b..02b6e85b 100644 --- a/features/lockfiles/ci_build_require/.gitignore +++ b/features/lockfiles/ci_build_require/.gitignore @@ -1,2 +1,4 @@ release/ -bo.json \ No newline at end of file +tmp/ +locks/ +bo*.json \ No newline at end of file From 306076a17304ed8e19324e1c1f22f28351e4b57e Mon Sep 17 00:00:00 2001 From: memsharded Date: Mon, 8 Feb 2021 23:52:25 +0100 Subject: [PATCH 4/4] fixing libb --- features/lockfiles/ci_build_require/libb/conanfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/features/lockfiles/ci_build_require/libb/conanfile.py b/features/lockfiles/ci_build_require/libb/conanfile.py index ce53dbde..580d6395 100644 --- a/features/lockfiles/ci_build_require/libb/conanfile.py +++ b/features/lockfiles/ci_build_require/libb/conanfile.py @@ -5,4 +5,3 @@ class LibBConan(ConanFile): settings = "build_type" requires = "liba/[>0.0 <1.0]@user/testing" -# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes# Some changes \ No newline at end of file