Skip to content

Commit

Permalink
Modify jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
atharva-2001 committed Jul 15, 2024
1 parent 27f9ddc commit 600ea56
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 245 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/fast_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
name: tests

on:
push:
branches:
- '*'
pull_request:
branches:
- '*'
workflow_dispatch:


env:
Expand Down
38 changes: 0 additions & 38 deletions .github/workflows/main.yml

This file was deleted.

101 changes: 0 additions & 101 deletions .github/workflows/new_tests.yml

This file was deleted.

162 changes: 62 additions & 100 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,104 +1,66 @@
# # For more information about TARDIS pipelines, please refer to:
# #
# # https://tardis-sn.github.io/tardis/development/continuous_integration.html

# name: tests

# on:
# push:
# branches:
# - '*'

# pull_request:
# branches:
# - '*'
# For more information about TARDIS pipelines, please refer to:
#
# https://tardis-sn.github.io/tardis/development/continuous_integration.html

name: tests

on:
push:
branches:
- '*'
pull_request:
branches:
- '*'

# types:
# - opened
# - reopened
# - synchronize
# - labeled

# env:
# CACHE_NUMBER: 0 # increase to reset cache manually
# PYTEST_FLAGS: --tardis-refdata=${{ github.workspace }}/tardis-refdata --tardis-regression-data=${{ github.workspace }}/tardis-regression-data
# --cov=tardis --cov-report=xml --cov-report=html
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

# concurrency:
# group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
# cancel-in-progress: true

# defaults:
# run:
# shell: bash -l {0}

# jobs:
# build:
# if: github.repository_owner == 'tardis-sn'
# strategy:
# matrix:
# pip: [true, false]
# label: [osx-arm64, linux-64]
# include:
# - label: osx-arm64
# os: macos-latest
# prefix: /Users/runner/miniconda3/envs/tardis

# - label: linux-64
# os: ubuntu-latest
# prefix: /usr/share/miniconda3/envs/tardis

# name: ${{ matrix.label }}-pip-${{ matrix.pip }}
# runs-on: ${{ matrix.os }}
# steps:
# - uses: actions/checkout@v4

# - name: Setup LFS
# uses: ./.github/actions/setup_lfs

# - name: Setup environment
# uses: ./.github/actions/setup_env
# with:
# os-label: ${{ matrix.label }}

# - name: Install package editable
# run: |
# pip install -e .
# echo "TARDIS_PIP_PATH=tardis" >> $GITHUB_ENV
# if: matrix.pip == false

# - name: Install package git
# run: pip install git+https://github.com/tardis-sn/tardis.git@${{ github.ref }}
# if: matrix.pip == true

# - name: Set pip path
# if: matrix.pip == true
# run: |
# location_line=$(pip show tardis | grep -i -x "Location:.*")
# directory_path=$(echo $location_line | awk -F " " '{print $2}')
# echo "TARDIS_PIP_PATH=$directory_path" >> $GITHUB_ENV
types:
- opened
- reopened
- synchronize
- labeled

env:
CACHE_NUMBER: 0 # increase to reset cache manually
PYTEST_FLAGS: --tardis-refdata=${{ github.workspace }}/tardis-refdata --tardis-regression-data=${{ github.workspace }}/tardis-regression-data
--cov=tardis --cov-report=xml --cov-report=html
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

defaults:
run:
shell: bash -l {0}


jobs:
tests:
name: ${{ matrix.continuum }} continuum ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
label: [osx-arm64, linux-64]
continuum: ['not', '']
include:
- label: osx-arm64
os: macos-latest
prefix: /Users/runner/miniconda3/envs/tardis

- label: linux-64
os: ubuntu-latest
prefix: /usr/share/miniconda3/envs/tardis
steps:
- uses: actions/checkout@v4

- name: Setup tardis
uses: ./.github/actions/setup_tardis
with:
os-label: ${{ matrix.label }}

# - name: Set install path
# if: matrix.pip == false
# run: |
# directory_path="."
# echo "TARDIS_PIP_PATH=$directory_path" >> $GITHUB_ENV

# - name: Run tests
# run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "not continuum"
# working-directory: ${{ env.TARDIS_PIP_PATH }}
# if: always()

# - name: Run continuum tests
# run: pytest tardis ${{ env.PYTEST_FLAGS }} -m continuum
# working-directory: ${{ env.TARDIS_PIP_PATH }}
# if: always()
- name: Install package editable
run: |
pip install -e . --user
# - name: Upload to Codecov
# run: bash <(curl -s https://codecov.io/bash)
- name: Run tests
run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum"

# - name: Refdata Generation tests
# run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference
# working-directory: ${{ env.TARDIS_PIP_PATH }}
# if: contains(github.event.pull_request.labels.*.name, 'run-generation-tests') || github.ref == 'refs/heads/master'
- name: Refdata Generation tests
run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum"
if: contains(github.event.pull_request.labels.*.name, 'run-generation-tests') || github.ref == 'refs/heads/master'

0 comments on commit 600ea56

Please sign in to comment.