Skip to content

Commit

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

Rebuild for libhwloc 2.11.1
  • Loading branch information
jan-janssen authored Jul 9, 2024
2 parents c634e68 + 17c0f44 commit 6f6b437
Show file tree
Hide file tree
Showing 23 changed files with 34 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpimpichpython3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpimpichpython3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpimpichpython3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpimpichpython3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpimpichpython3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libarchive:
- '3.7'
libhwloc:
- 2.11.0
- 2.11.1
libuuid:
- '2'
lua:
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/libhwloc2111.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.1
kind: version
migration_number: 1
libhwloc:
- 2.11.1
migrator_ts: 1720471981.8039248
10 changes: 5 additions & 5 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
github:
branch_name: main
tooling_branch_name: main
build_platform:
linux_aarch64: linux_64
conda_build:
error_overlinking: true
conda_forge_output_validation: true
build_platform:
linux_aarch64: linux_64
github:
branch_name: main
tooling_branch_name: main
test: native_and_emulated
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: 3
number: 4
skip: true # [not linux]
run_exports:
- {{ pin_subpackage('flux-core', max_pin='x.x') }}
Expand Down

0 comments on commit 6f6b437

Please sign in to comment.