Skip to content

Commit 02ff8d5

Browse files
traversarotraversaro
authored
Merge pull request #86 from regro-cf-autotick-bot/rebuild-protobuf423-0-2_h85d81e
Rebuild for protobuf423 [ign-msg5]
2 parents 0b507c3 + 0c2a44c commit 02ff8d5

26 files changed

+370
-63
lines changed

‎.azure-pipelines/azure-pipelines-linux.yml‎

Lines changed: 18 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.azure-pipelines/azure-pipelines-osx.yml‎

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.azure-pipelines/azure-pipelines-win.yml‎

Lines changed: 11 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.ci_support/linux_64_.yaml renamed to .ci_support/linux_64_libprotobuf3.21.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
c_compiler:
22
- gcc
33
c_compiler_version:
4-
- '10'
4+
- '12'
55
cdt_name:
66
- cos6
77
channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
1111
cxx_compiler:
1212
- gxx
1313
cxx_compiler_version:
14-
- '10'
14+
- '12'
1515
docker_image:
1616
- quay.io/condaforge/linux-anvil-cos7-x86_64
1717
libprotobuf:

‎.ci_support/linux_64_libprotobuf4.23.2.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
c_compiler:
2+
- gcc
3+
c_compiler_version:
4+
- '12'
5+
cdt_name:
6+
- cos6
7+
channel_sources:
8+
- conda-forge
9+
channel_targets:
10+
- conda-forge main
11+
cxx_compiler:
12+
- gxx
13+
cxx_compiler_version:
14+
- '12'
15+
docker_image:
16+
- quay.io/condaforge/linux-anvil-cos7-x86_64
17+
libprotobuf:
18+
- 4.23.2
19+
target_platform:
20+
- linux-64
21+
tinyxml2:
22+
- '9'
23+
zip_keys:
24+
- - c_compiler_version
25+
- cxx_compiler_version

.ci_support/linux_aarch64_.yaml renamed to .ci_support/linux_aarch64_libprotobuf3.21.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BUILD:
33
c_compiler:
44
- gcc
55
c_compiler_version:
6-
- '10'
6+
- '12'
77
cdt_arch:
88
- aarch64
99
cdt_name:
@@ -15,7 +15,7 @@ channel_targets:
1515
cxx_compiler:
1616
- gxx
1717
cxx_compiler_version:
18-
- '10'
18+
- '12'
1919
docker_image:
2020
- quay.io/condaforge/linux-anvil-cos7-x86_64
2121
libprotobuf:

‎.ci_support/linux_aarch64_libprotobuf4.23.2.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
BUILD:
2+
- aarch64-conda_cos7-linux-gnu
3+
c_compiler:
4+
- gcc
5+
c_compiler_version:
6+
- '12'
7+
cdt_arch:
8+
- aarch64
9+
cdt_name:
10+
- cos7
11+
channel_sources:
12+
- conda-forge
13+
channel_targets:
14+
- conda-forge main
15+
cxx_compiler:
16+
- gxx
17+
cxx_compiler_version:
18+
- '12'
19+
docker_image:
20+
- quay.io/condaforge/linux-anvil-cos7-x86_64
21+
libprotobuf:
22+
- 4.23.2
23+
target_platform:
24+
- linux-aarch64
25+
tinyxml2:
26+
- '9'
27+
zip_keys:
28+
- - c_compiler_version
29+
- cxx_compiler_version

.ci_support/linux_ppc64le_.yaml renamed to .ci_support/linux_ppc64le_libprotobuf3.21.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
c_compiler:
22
- gcc
33
c_compiler_version:
4-
- '10'
4+
- '12'
55
cdt_name:
66
- cos7
77
channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
1111
cxx_compiler:
1212
- gxx
1313
cxx_compiler_version:
14-
- '10'
14+
- '12'
1515
docker_image:
1616
- quay.io/condaforge/linux-anvil-cos7-x86_64
1717
libprotobuf:

‎.ci_support/linux_ppc64le_libprotobuf4.23.2.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
c_compiler:
2+
- gcc
3+
c_compiler_version:
4+
- '12'
5+
cdt_name:
6+
- cos7
7+
channel_sources:
8+
- conda-forge
9+
channel_targets:
10+
- conda-forge main
11+
cxx_compiler:
12+
- gxx
13+
cxx_compiler_version:
14+
- '12'
15+
docker_image:
16+
- quay.io/condaforge/linux-anvil-cos7-x86_64
17+
libprotobuf:
18+
- 4.23.2
19+
target_platform:
20+
- linux-ppc64le
21+
tinyxml2:
22+
- '9'
23+
zip_keys:
24+
- - c_compiler_version
25+
- cxx_compiler_version

‎.ci_support/migrations/libprotobuf321.yaml‎

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

0 commit comments

Comments
 (0)