1
0
mirror of https://github.com/TREX-CoE/trexio.git synced 2024-12-22 20:35:44 +01:00

First try macos-arm64 (#137)

* First try macos-arm64

* Test new macos-14 runner

* Update actions.yml

* Install libtool

* Install swig

* User install for python

* Update install_pytrexio.sh

* Update install_pytrexio.sh

* Update install_pytrexio.sh

* Update Makefile.am

* Update Makefile.am

* Update Makefile.am

* Update actions.yml

* Update actions.yml

* Update install_pytrexio.sh [skip ci]

* Update actions.yml

* Update Makefile.am

* Update actions.yml

* Setup venv in CI and not in the installation script
This commit is contained in:
Evgeny Posenitskiy 2024-06-16 19:13:59 +02:00 committed by GitHub
parent 05b943f6ed
commit 92504e0bea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 14 deletions

View File

@ -15,7 +15,7 @@ jobs:
get_commit_message: get_commit_message:
name: Get commit message name: Get commit message
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
outputs: outputs:
message: ${{ steps.commit_message.outputs.message }} message: ${{ steps.commit_message.outputs.message }}
steps: steps:
@ -33,7 +33,7 @@ jobs:
trexio_ubuntu: trexio_ubuntu:
name: x86 Ubuntu 20.04 name: x86 Ubuntu 20.04
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
needs: get_commit_message needs: get_commit_message
steps: steps:
@ -53,8 +53,8 @@ jobs:
- name: install dependencies - name: install dependencies
run: | run: |
sudo add-apt-repository ppa:kelleyk/emacs sudo apt-get update
sudo apt-get install libhdf5-dev emacs26 sudo apt-get install libhdf5-dev emacs
- name: configure with autotools - name: configure with autotools
run: | run: |
@ -74,19 +74,24 @@ jobs:
name: test-report-ubuntu name: test-report-ubuntu
path: test-suite.log path: test-suite.log
- name: create virtual environment - name: create venv
run: | run: |
python3 -m venv --clear pytrexio-venv python3 -m venv trexio-venv
source pytrexio-venv/bin/activate source trexio-venv/bin/activate
- name: install Python API - name: install Python API
run: make python-install run: |
source trexio-venv/bin/activate
make python-install
- name: check Python API - name: check Python API
run: make python-test run: |
source trexio-venv/bin/activate
make python-test
- name: build and move Python API distribution - name: build and move Python API distribution
run: | run: |
source trexio-venv/bin/activate
make python-sdist make python-sdist
cp python/dist/trexio-*.tar.gz . cp python/dist/trexio-*.tar.gz .
@ -105,7 +110,7 @@ jobs:
- name: reconfigure with clang and AddressSanitizer - name: reconfigure with clang and AddressSanitizer
run: | run: |
./autogen.sh ./autogen.sh
./configure CC=clang-11 CFLAGS="-O2 -fsanitize=address -fno-omit-frame-pointer" LDFLAGS="-fsanitize=address" --enable-silent-rules ./configure CC=clang-15 CFLAGS="-O2 -fsanitize=address -fno-omit-frame-pointer" LDFLAGS="-fsanitize=address" --enable-silent-rules
- name: recompile TREXIO - name: recompile TREXIO
run: make -j2 run: make -j2
@ -124,8 +129,8 @@ jobs:
run: make maintainer-clean run: make maintainer-clean
trexio_macos: trexio_macos:
name: x86 MacOS 12 name: arm64 MacOS
runs-on: macos-12 runs-on: macos-14
steps: steps:
- uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791
@ -135,6 +140,8 @@ jobs:
brew install emacs brew install emacs
brew install hdf5 brew install hdf5
brew install automake brew install automake
brew install libtool
brew install swig
brew --prefix hdf5 brew --prefix hdf5
- name: configure with autotools - name: configure with autotools
@ -148,14 +155,22 @@ jobs:
- name: check TREXIO - name: check TREXIO
run: make -j3 check run: make -j3 check
- name: create venv
run: |
python3 -m venv trexio-venv
source trexio-venv/bin/activate
- name: compile Python API - name: compile Python API
run: | run: |
export H5_CFLAGS="-I$(brew --prefix hdf5)/include" export H5_CFLAGS="-I$(brew --prefix hdf5)/include"
export H5_LDFLAGS="-L$(brew --prefix hdf5)/lib" export H5_LDFLAGS="-L$(brew --prefix hdf5)/lib"
source trexio-venv/bin/activate
make python-install make python-install
- name: test Python API - name: test Python API
run: make python-test run: |
source trexio-venv/bin/activate
make python-test
- name: Archive test log file - name: Archive test log file
if: failure() if: failure()

View File

@ -63,8 +63,9 @@ else
export H5_CFLAGS=${H5_CFLAGS_LOCAL} export H5_CFLAGS=${H5_CFLAGS_LOCAL}
fi fi
# Install/upgrade packages required for the installation # Install/upgrade packages required for the installation
python3 -m pip install --upgrade setuptools build pip python3 -m pip install build
python3 -m pip install -r requirements.txt python3 -m pip install -r requirements.txt
python3 -m pip install pytest python3 -m pip install pytest