Skip to content

Commit

Permalink
Merge branch 'develop' into feature-faster-circuit-primitives
Browse files Browse the repository at this point in the history
  • Loading branch information
Corey Ostrove committed May 30, 2024
2 parents 18c6d04 + 3e62da3 commit 130cea6
Show file tree
Hide file tree
Showing 14 changed files with 254 additions and 589 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/beta-master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This workflow runs a full test suite on beta and master
# This includes all versions of supported Python, all OSes, and all test subsets

name: Build and run tests (beta & master)

on:
push:
branches: [ "beta", "master" ]
workflow_dispatch: # Allow manual running from GitHub

jobs:
build:
strategy:
fail-fast: false
matrix:
os: [macos-13, ubuntu-latest, windows-latest] # TODO: Unpin mac version when cvxopt or Python 3.8 dropped
python-version: [3.8, 3.9, '3.10', '3.11']
use-cython: ['true', 'false']
uses: ./.github/workflows/reuseable-main.yml
name: Run pyGSTi tests
with:
os: ${{ matrix.os }}
python-version: ${{ matrix.python-version }}
use-cython: ${{ matrix.use-cython }}
run-unit-tests: 'true'
run-extra-tests: 'true'
run-notebook-tests: 'true'






52 changes: 52 additions & 0 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# This workflow runs a moderate test suite on develop
# This includes all versions of supported Python, no MacOS, only unit tests,
# and only tests environments with Cython in them

name: Build and run tests (develop)

on:
push:
branches: [ "develop" ]
workflow_dispatch: # Allow manual running from GitHub

jobs:
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest] # No Mac
python-version: [3.8, 3.9, '3.10', '3.11']
use-cython: ['true', 'false']
uses: ./.github/workflows/reuseable-main.yml
name: Run pyGSTi tests
with:
os: ${{ matrix.os }}
python-version: ${{ matrix.python-version }}
use-cython: 'true' # Cython only
run-unit-tests: 'true'
run-extra-tests: 'false' # No integration tests
run-notebook-tests: 'false' # No notebook tests

push: # Push to stable "beta" branch on successful build
runs-on: ubuntu-latest

# Only run on "develop" branch if tests pass
needs: build
if: github.ref == 'refs/heads/develop' && github.event_name == 'push'

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.PYGSTI_TOKEN }}
- name: Merge changes to beta branch
run: |
git config --global user.name 'PyGSTi'
git config --global user.email '[email protected]'
git checkout beta
git merge --ff-only ${GITHUB_SHA} && git push origin beta
71 changes: 0 additions & 71 deletions .github/workflows/extras.yml

This file was deleted.

37 changes: 37 additions & 0 deletions .github/workflows/feature-branches.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This workflow runs a light test suite on all non-main branches
# This includes only least/most supported Python version, no MacOS, only unit tests,
# and only tests environments with Cython in them

name: Build and run tests (feature branches)

on:
push:
branches-ignore: [ "beta", "develop", "master" ]
# Hacky way to only run pull requests from forked repositories (assumes : is not used in branch names unless forked)
# https://github.community/t/how-to-trigger-an-action-on-push-or-pull-request-but-not-both/16662/10
pull_request:
branches: [ "**:**" ]
workflow_dispatch: # Allow manual running from GitHub

jobs:
build:
strategy:
# fail-fast: true is OK here
matrix:
os: [ubuntu-latest, windows-latest] # No Mac
python-version: [3.8, '3.11'] # Only extremal Python versions
uses: ./.github/workflows/reuseable-main.yml
name: Run pyGSTi tests
with:
os: ${{ matrix.os }}
python-version: ${{ matrix.python-version }}
use-cython: 'true' # Only test environment with Cython
run-unit-tests: 'true'
run-extra-tests: 'false' # No integration tests
run-notebook-tests: 'false' # No notebook tests






61 changes: 0 additions & 61 deletions .github/workflows/main-mac.yml

This file was deleted.

72 changes: 0 additions & 72 deletions .github/workflows/main-minimal.yml

This file was deleted.

Loading

0 comments on commit 130cea6

Please sign in to comment.