Skip to content

Commit

Permalink
update github actions; bump version 2.0a2
Browse files Browse the repository at this point in the history
  • Loading branch information
bpuchala committed Jul 17, 2024
1 parent dec4619 commit 6a01206
Show file tree
Hide file tree
Showing 16 changed files with 111 additions and 60 deletions.
18 changes: 12 additions & 6 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build_and_store_wheels: &BUILD_AND_STORE_WHEELS
install_cibuildwheel_script:
- python -m pip install cibuildwheel==2.17.0
- python -m pip install cibuildwheel==2.19.2
run_cibuildwheel_script:
- cibuildwheel
wheels_artifacts:
Expand All @@ -16,17 +16,23 @@ linux_aarch64_task:
cpu: 4
memory: 4G
env:
CIBW_ARCHS_LINUX: aarch64
VENV_ROOT: ${HOME}/venv-cibuildwheel
PATH: ${VENV_ROOT}/bin:${PATH}
install_pre_requirements_script:
- apt install -y python3-venv python-is-python3
- add-apt-repository -y ppa:deadsnakes/ppa
- apt-get update
- apt-get install -y python3.12-venv
- python3.12 -m venv ${VENV_ROOT}
<<: *BUILD_AND_STORE_WHEELS

macos_arm64_task:
name: Build macOS arm64 wheels.
macos_instance:
image: ghcr.io/cirruslabs/macos-sonoma-xcode
image: ghcr.io/cirruslabs/macos-runner:sonoma
env:
PATH: /opt/homebrew/opt/[email protected]/libexec/bin:$PATH
VENV_ROOT: ${HOME}/venv-cibuildwheel
PATH: ${VENV_ROOT}/bin:${PATH}
install_pre_requirements_script:
- brew install [email protected]
- brew install [email protected]
- python3.12 -m venv ${VENV_ROOT}
<<: *BUILD_AND_STORE_WHEELS
27 changes: 24 additions & 3 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Build wheels

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

jobs:
build_wheels_linux_x86_64:
Expand All @@ -20,7 +24,7 @@ jobs:
name: dist_linux
path: ./wheelhouse/*.whl

build_wheels_macos_x86_64:
build_wheels_macos12_x86_64:
name: Build x86_64 wheels on macos-12
runs-on: macos-12

Expand All @@ -34,7 +38,24 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: dist_macos
name: dist_macos12_x86_64
path: ./wheelhouse/*.whl

build_wheels_macos14_arm64:
name: Build arm64 wheels on macos-14
runs-on: macos-14

steps:
- uses: actions/checkout@v4

- name: Build wheels
uses: pypa/[email protected]
env:
CIBW_ARCHS_MACOS: arm64

- uses: actions/upload-artifact@v4
with:
name: dist_macos14_arm64
path: ./wheelhouse/*.whl

build_sdist:
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/test-linux-build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Testing build on ubuntu-latest

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

env:
SKBUILD_BUILD_OPTIONS: --verbose
Expand Down Expand Up @@ -32,23 +36,23 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_global/dist
key: ${{ runner.os }}-libcasm-global-v2-0-4
key: ${{ runner.os }}-libcasm-global-v2-0-5

### libcasm-composition ###
- name: restore libcasm-composition cache
id: cache-libcasm-composition-restore
uses: actions/cache/restore@v4
with:
path: CASMcode_composition/dist
key: ${{ runner.os }}-libcasm-composition-v2-0a2
key: ${{ runner.os }}-libcasm-composition-v2-0a3

### libcasm-xtal ###
- name: restore libcasm-xtal cache
id: cache-libcasm-xtal-restore
uses: actions/cache/restore@v4
with:
path: CASMcode_crystallography/dist
key: ${{ runner.os }}-libcasm-xtal-v2-0a9
key: ${{ runner.os }}-libcasm-xtal-v2-0a10

- name: Install CASM dependencies
run: |
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/test-linux-cxx-only.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Testing c++ only on ubuntu-latest

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

env:
SKBUILD_BUILD_OPTIONS: --verbose
Expand Down Expand Up @@ -32,23 +36,23 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_global/dist
key: ${{ runner.os }}-libcasm-global-v2-0-4
key: ${{ runner.os }}-libcasm-global-v2-0-5

### libcasm-composition ###
- name: restore libcasm-composition cache
id: cache-libcasm-composition-restore
uses: actions/cache/restore@v4
with:
path: CASMcode_composition/dist
key: ${{ runner.os }}-libcasm-composition-v2-0a2
key: ${{ runner.os }}-libcasm-composition-v2-0a3

### libcasm-xtal ###
- name: restore libcasm-xtal cache
id: cache-libcasm-xtal-restore
uses: actions/cache/restore@v4
with:
path: CASMcode_crystallography/dist
key: ${{ runner.os }}-libcasm-xtal-v2-0a9
key: ${{ runner.os }}-libcasm-xtal-v2-0a10

- name: Install CASM dependencies
run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test-linux-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_global/dist
key: ${{ runner.os }}-libcasm-global-v2-0-4
key: ${{ runner.os }}-libcasm-global-v2-0-5

- name: checkout libcasm-global
if: steps.cache-libcasm-global-restore.outputs.cache-hit != 'true'
uses: actions/checkout@v4
with:
repository: prisms-center/CASMcode_global
path: CASMcode_global
ref: v2.0.4
ref: v2.0.5

- name: make global
if: steps.cache-libcasm-global-restore.outputs.cache-hit != 'true'
Expand All @@ -58,15 +58,15 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_composition/dist
key: ${{ runner.os }}-libcasm-composition-v2-0a2
key: ${{ runner.os }}-libcasm-composition-v2-0a3

- name: checkout libcasm-composition
if: steps.cache-libcasm-composition-restore.outputs.cache-hit != 'true'
uses: actions/checkout@v4
with:
repository: prisms-center/CASMcode_composition
path: CASMcode_composition
ref: v2.0a2
ref: v2.0a3

- name: make composition
if: steps.cache-libcasm-composition-restore.outputs.cache-hit != 'true'
Expand All @@ -91,15 +91,15 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_crystallography/dist
key: ${{ runner.os }}-libcasm-xtal-v2-0a9
key: ${{ runner.os }}-libcasm-xtal-v2-0a10

- name: checkout libcasm-xtal
if: steps.cache-libcasm-xtal-restore.outputs.cache-hit != 'true'
uses: actions/checkout@v4
with:
repository: prisms-center/CASMcode_crystallography
path: CASMcode_crystallography
ref: v2.0a9
ref: v2.0a10

- name: make xtal
if: steps.cache-libcasm-xtal-restore.outputs.cache-hit != 'true'
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/test-linux-pip-install-dependencies.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Test CASM dependencies from PyPI on Ubuntu

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

jobs:
install-and-test:
Expand All @@ -23,13 +27,13 @@ jobs:
with:
repository: prisms-center/CASMcode_global
path: CASMcode_global
ref: v2.0.4
ref: v2.0.5

- name: test libcasm-global
shell: bash
run: |
cd CASMcode_global
pip install libcasm-global==2.0.4
pip install libcasm-global==2.0.5
pip install -r test_requirements.txt
python -m pytest -rsap python/tests
Expand All @@ -39,14 +43,14 @@ jobs:
with:
repository: prisms-center/CASMcode_composition
path: CASMcode_composition
ref: v2.0a2
ref: v2.0a3

- name: test libcasm-composition
if: steps.cache-libcasm-composition-restore.outputs.cache-hit != 'true'
shell: bash
run: |
cd CASMcode_composition
pip install libcasm-composition==2.0a2
pip install libcasm-composition==2.0a3
pip install -r test_requirements.txt
python -m pytest -rsap python/tests
Expand All @@ -56,12 +60,12 @@ jobs:
with:
repository: prisms-center/CASMcode_crystallography
path: CASMcode_crystallography
ref: v2.0a9
ref: v2.0a10

- name: test libcasm-xtal
shell: bash
run: |
cd CASMcode_crystallography
pip install libcasm-xtal==2.0a9
pip install libcasm-xtal==2.0a10
pip install -r test_requirements.txt
python -m pytest -rsap python/tests
12 changes: 8 additions & 4 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Testing on ubuntu-latest

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

env:
SKBUILD_BUILD_OPTIONS: --verbose
Expand Down Expand Up @@ -32,23 +36,23 @@ jobs:
uses: actions/cache/restore@v4
with:
path: CASMcode_global/dist
key: ${{ runner.os }}-libcasm-global-v2-0-4
key: ${{ runner.os }}-libcasm-global-v2-0-5

### libcasm-composition ###
- name: restore libcasm-composition cache
id: cache-libcasm-composition-restore
uses: actions/cache/restore@v4
with:
path: CASMcode_composition/dist
key: ${{ runner.os }}-libcasm-composition-v2-0a2
key: ${{ runner.os }}-libcasm-composition-v2-0a3

### libcasm-xtal ###
- name: restore libcasm-xtal cache
id: cache-libcasm-xtal-restore
uses: actions/cache/restore@v4
with:
path: CASMcode_crystallography/dist
key: ${{ runner.os }}-libcasm-xtal-v2-0a9
key: ${{ runner.os }}-libcasm-xtal-v2-0a10

- name: Install CASM dependencies
run: |
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test-macos-build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Testing build on macos-latest

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

jobs:
build:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test-macos.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Testing on macos-latest

on: [push, pull_request]
on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0'

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [2.0a2] - 2024-07-16
## [2.0a2] - 2024-07-17

### Added

Expand Down
6 changes: 3 additions & 3 deletions build_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ cmake>=3.20
ninja
pybind11>=2.6
numpy
libcasm-global>=2.0.4
libcasm-xtal>=2.0a9
libcasm-composition>=2.0a2
libcasm-global>=2.0.5
libcasm-xtal>=2.0a10
libcasm-composition>=2.0a3
Loading

0 comments on commit 6a01206

Please sign in to comment.