Skip to content
Snippets Groups Projects
Unverified Commit fd9a7493 authored by Brent Huisman's avatar Brent Huisman Committed by GitHub
Browse files

CI fixes for wheel building, prep for musllinux, Spack (#2069)

* 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](https://github.com/pypa/cibuildwheel/issues/1376)
* The reason for using `ubuntu-20.04` in the Spack workflow should [no
longer exist](https://github.com/actions/runner-images/issues/6724).
parent d2441550
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ on: ...@@ -14,7 +14,7 @@ on:
jobs: jobs:
get_timestamp: get_timestamp:
name: Prep VERSION name: Prep VERSION
runs-on: ubuntu-latest runs-on: ubuntu-20.04
steps: steps:
- name: Get Arbor - name: Get Arbor
...@@ -35,7 +35,7 @@ jobs: ...@@ -35,7 +35,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, macos-latest] os: [ubuntu-20.04, macos-latest]
steps: steps:
- name: Get Arbor - name: Get Arbor
...@@ -62,7 +62,7 @@ jobs: ...@@ -62,7 +62,7 @@ jobs:
build_sdist: build_sdist:
name: Build sdist name: Build sdist
needs: get_timestamp needs: get_timestamp
runs-on: ubuntu-latest runs-on: ubuntu-20.04
steps: steps:
- name: Get packages - name: Get packages
...@@ -94,7 +94,7 @@ jobs: ...@@ -94,7 +94,7 @@ jobs:
upload_test_pypi: upload_test_pypi:
name: upload to test pypi name: upload to test pypi
runs-on: ubuntu-latest runs-on: ubuntu-20.04
needs: [build_binary_wheels, build_sdist] needs: [build_binary_wheels, build_sdist]
steps: steps:
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
......
...@@ -11,7 +11,7 @@ jobs: ...@@ -11,7 +11,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-20.04] os: [ubuntu-22.04]
python-version: [3.8] python-version: [3.8]
steps: steps:
- name: Checkout - name: Checkout
......
...@@ -14,9 +14,9 @@ extern "C" { ...@@ -14,9 +14,9 @@ extern "C" {
namespace arb { namespace arb {
namespace hw { namespace hw {
#if defined(__linux__) #if defined(__linux__) && defined(__GLIBC__)
memory_size_type allocated_memory() { 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(); auto m = mallinfo2();
#else #else
auto m = mallinfo(); auto m = mallinfo();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment