Skip to content

Commit

Permalink
CI fixes for wheel building, prep for musllinux, Spack (#2069)
Browse files Browse the repository at this point in the history
* Python Wheel workflow uses `ubuntu-20.04` to fix the build
  * In #2058 I forgot to update `ciwheel.yml`
* Why this is necessarily: still have not figured it out. `cibuildwheel`
builds and tests in it's own container...
  * [x] https://github.com/brenthuisman/arbor/actions/runs/3704419712
* Small change to make `musllinux` wheels build. They don't pass testing
yet, so I don't add them to the workflow but that can be solved/added
[later](pypa/cibuildwheel#1376)
* The reason for using `ubuntu-20.04` in the Spack workflow should [no
longer exist](actions/runner-images#6724).
  • Loading branch information
brenthuisman authored Dec 15, 2022
1 parent d244155 commit fd9a749
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ciwheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
get_timestamp:
name: Prep VERSION
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Get Arbor
Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-20.04, macos-latest]

steps:
- name: Get Arbor
Expand All @@ -62,7 +62,7 @@ jobs:
build_sdist:
name: Build sdist
needs: get_timestamp
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Get packages
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:

upload_test_pypi:
name: upload to test pypi
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
needs: [build_binary_wheels, build_sdist]
steps:
- uses: actions/download-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
os: [ubuntu-22.04]
python-version: [3.8]
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions arbor/hardware/memory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ extern "C" {
namespace arb {
namespace hw {

#if defined(__linux__)
#if defined(__linux__) && defined(__GLIBC__)
memory_size_type allocated_memory() {
#if defined(__GLIBC__) && (__GLIBC__ > 2 || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 33)))
#if __GLIBC__ > 2 || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 33))
auto m = mallinfo2();
#else
auto m = mallinfo();
Expand Down

0 comments on commit fd9a749

Please sign in to comment.