Skip to content

Commit f5586dc

Browse files
committed
cherry pick changes from #452
1 parent 8da89d3 commit f5586dc

File tree

8 files changed

+20
-38
lines changed

8 files changed

+20
-38
lines changed

.github/workflows/build_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
- name: conan remote
5454
run: |
5555
conan remote remove "*"
56-
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
5756
conan remote add conancenter https://center2.conan.io
57+
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
5858
- name: conan config
5959
run: conan config install .github/config/conan
6060
- name: conan install

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
- name: conan remote
3030
run: |
3131
conan remote remove "*"
32-
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
3332
conan remote add conancenter https://center2.conan.io
33+
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
3434
- name: conan config
3535
run: conan config install .github/config/conan
3636
- name: conan install

.github/workflows/tidy.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ jobs:
2828
run: pip install --upgrade pip conan
2929

3030
- name: conan remote
31-
run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
31+
run: |
32+
conan remote remove "*"
33+
conan remote add conancenter https://center2.conan.io
34+
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
3235
- name: conan config
3336
run: conan config install .github/config/conan
3437
- name: conan install

conan.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1744702067.178",
4545
"brotli/1.1.0#406ce8f1c997f4ef7852fa01ff85ef9f%1743158659.041",
4646
"boost/1.86.0#cd839a2082585255010f9e82eea94c7f%1728027203.247",
47-
"argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1754427608.210625"
47+
"argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1764497584.637"
4848
],
4949
"build_requires": [
5050
"zstd/1.5.7#fde461c0d847a22f16d3066774f61b11%1744114235.235",

scripts/conan_install

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
3+
conan install . --output-folder=cmake-build-relwithdebinfo --build=missing -s build_type=RelWithDebInfo -s "&:build_type=RelWithDebInfo"
4+
conan install . --output-folder=cmake-build-debug --build=missing -s build_type=RelWithDebInfo -s "&:build_type=Debug"
5+
conan install . --output-folder=cmake-build-release --build=missing -s build_type=RelWithDebInfo -s "&:build_type=Release"

scripts/conan_lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
3+
conan lock create .
4+
5+
for profile in .github/config/conan/profiles/*; do
6+
conan lock create . --profile:build "${profile}" --profile:host "${profile}"
7+
done

scripts/resource_to_cpp.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

scripts/setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
scripts/git_hooks/git-hooks --install
55

66
# setup conan
7-
scripts/conan
7+
scripts/conan_install

0 commit comments

Comments
 (0)