Skip to content

Commit

Permalink
Merge pull request #47 from regro-cf-autotick-bot/rebuild-libhwloc211…
Browse files Browse the repository at this point in the history
…0-0-1_hd97d28

Rebuild for libhwloc 2.11.0
  • Loading branch information
jan-janssen authored Jul 4, 2024
2 parents 8492b59 + b3a6f3e commit 42fb0f5
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 39 deletions.
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpimpichpython3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.10.0
- 2.11.0
libuuid:
- '2'
lua:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpimpichpython3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.10.0
- 2.11.0
libuuid:
- '2'
lua:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpimpichpython3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.10.0
- 2.11.0
libuuid:
- '2'
lua:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpimpichpython3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.10.0
- 2.11.0
libuuid:
- '2'
lua:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpimpichpython3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.10.0
- 2.11.0
libuuid:
- '2'
lua:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.10.0
- 2.11.0
libuuid:
- '2'
lua:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.10.0
- 2.11.0
libuuid:
- '2'
lua:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.10.0
- 2.11.0
libuuid:
- '2'
lua:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.10.0
- 2.11.0
libuuid:
- '2'
lua:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.10.0
- 2.11.0
libuuid:
- '2'
lua:
Expand Down
8 changes: 0 additions & 8 deletions .ci_support/migrations/libhwloc2100.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions .ci_support/migrations/libhwloc2110.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for libhwloc 2.11.0
kind: version
migration_number: 1
libhwloc:
- 2.11.0
migrator_ts: 1719349281.82988
7 changes: 7 additions & 0 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source:
- centos6.patch # This patch can be removed once the conda-forge reference is updated

build:
number: 1
number: 2
skip: true # [not linux]
run_exports:
- {{ pin_subpackage('flux-core', max_pin='x.x') }}
Expand Down

0 comments on commit 42fb0f5

Please sign in to comment.