From e8c0e6907ea3132182d7f994d71d7a1e7fbccf47 Mon Sep 17 00:00:00 2001 From: Atharva Arya Date: Mon, 15 Jul 2024 18:53:06 +0530 Subject: [PATCH] Modify jobs --- .github/workflows/fast_tests.yml | 7 +- .github/workflows/main.yml | 38 -------- .github/workflows/new_tests.yml | 101 ------------------- .github/workflows/tests.yml | 162 ++++++++++++------------------- 4 files changed, 63 insertions(+), 245 deletions(-) delete mode 100644 .github/workflows/main.yml delete mode 100644 .github/workflows/new_tests.yml diff --git a/.github/workflows/fast_tests.yml b/.github/workflows/fast_tests.yml index 4706de0cc69..07345a08448 100644 --- a/.github/workflows/fast_tests.yml +++ b/.github/workflows/fast_tests.yml @@ -5,12 +5,7 @@ name: tests on: - push: - branches: - - '*' - pull_request: - branches: - - '*' + workflow_dispatch: env: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 7dba9224d3b..00000000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,38 +0,0 @@ -# name: main - -# on: -# push: -# branches: -# - '*' -# pull_request: -# branches: -# - '*' - -# concurrency: -# group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} -# cancel-in-progress: true - - -# jobs: -# matrix: -# if: github.repository_owner == 'tardis-sn' -# strategy: -# # super important if you want to see all results, even if one fails -# # fail-fast is true by default -# fail-fast: false -# matrix: -# 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 - -# uses: ./.github/workflows/new_tests.yml -# with: -# run_label: ${{ matrix.label }} -# run_os: ${{ matrix.os }} -# secrets: inherit \ No newline at end of file diff --git a/.github/workflows/new_tests.yml b/.github/workflows/new_tests.yml deleted file mode 100644 index 3132b8bc73d..00000000000 --- a/.github/workflows/new_tests.yml +++ /dev/null @@ -1,101 +0,0 @@ -# # For more information about TARDIS pipelines, please refer to: -# # -# # https://tardis-sn.github.io/tardis/development/continuous_integration.html - -# name: tests - -# on: -# workflow_call: -# inputs: -# run_label: -# required: true -# type: string -# run_os: -# required: true -# type: string - -# # 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 }} - -# defaults: -# run: -# shell: bash -l {0} - -# jobs: -# test-matrix: -# name: base-${{ inputs.run_label }} -# runs-on: ${{ inputs.run_os }} -# steps: -# - uses: actions/checkout@v3 -# - uses: actions/upload-artifact@v4 -# with: -# name: tardis-repo-${{ inputs.run_label }} -# path: ./ -# retention-days: 1 - -# non-continuum: -# runs-on: ${{ inputs.run_os }} -# needs: test-matrix -# steps: -# - uses: actions/download-artifact@v4 -# with: -# name: tardis-repo-${{ inputs.run_label }} -# path: ./ - -# - name: Setup tardis -# uses: ./.github/actions/setup_tardis -# with: -# os-label: ${{ inputs.run_label }} - -# - name: Install package editable -# run: | -# pip install -e . --user - -# - name: Run tests -# run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "not continuum" - -# - name: Refdata Generation tests -# run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -# if: contains(github.event.pull_request.labels.*.name, 'run-generation-tests') || github.ref == 'refs/heads/master' - -# continuum_tests: -# needs: test-matrix -# runs-on: ${{ inputs.run_label }} -# steps: -# - uses: actions/download-artifact@v4 -# with: -# name: tardis-repo-${{ inputs.run_label }} -# path: ./ - -# - name: Setup tardis -# uses: ./.github/actions/setup_tardis -# with: -# os-label: ${{ inputs.run_label }} - -# - name: Install package editable -# run: | -# pip install -e . - -# - name: Run continuum tests -# run: pytest tardis ${{ env.PYTEST_FLAGS }} -m continuum - -# - name: Refdata Generation tests -# run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -# if: contains(github.event.pull_request.labels.*.name, 'run-generation-tests') || github.ref == 'refs/heads/master' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9f6a54850fe..42369bc1fff 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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' \ No newline at end of file