From 8e0dc5f348ade58aafc72ad8b17def2c0f3ec168 Mon Sep 17 00:00:00 2001 From: Robin Steuteville Date: Wed, 21 Feb 2024 16:14:59 -0700 Subject: [PATCH] seeing if if github.repo works in tests.yaml --- .github/workflows/py-tests.yaml | 58 ++++++++++----------- .github/workflows/rust-tests.yaml | 84 +++++++++++++++--------------- .github/workflows/tests.yaml | 85 ++++++++++++++++--------------- .github/workflows/wheels.yaml | 3 +- 4 files changed, 116 insertions(+), 114 deletions(-) diff --git a/.github/workflows/py-tests.yaml b/.github/workflows/py-tests.yaml index 5410e6a1..806ef288 100644 --- a/.github/workflows/py-tests.yaml +++ b/.github/workflows/py-tests.yaml @@ -1,36 +1,36 @@ -name: py-tests +# name: py-tests -on: - push: - branches: [fastsim-2, fastsim-3] - pull_request: - workflow_dispatch: - workflow_call: +# on: +# push: +# branches: [fastsim-2, fastsim-3] +# pull_request: +# workflow_dispatch: +# workflow_call: -jobs: - test: - # might not be needed - # if: github.repository == 'nrel/fastsim' +# jobs: +# test: +# # might not be needed +# # if: github.repository == 'nrel/fastsim' - runs-on: ubuntu-latest +# runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - python-version: ['3.8', '3.9', '3.10'] +# strategy: +# fail-fast: true +# matrix: +# python-version: ['3.8', '3.9', '3.10'] - # if: contains(github.event.pull_request.changed_files, 'python/') || contains(github.event.pull_request.changed_files, 'rust/') - env: - PYTHON: ${{ matrix.python-version }} - steps: - - uses: actions/checkout@v3 +# # if: contains(github.event.pull_request.changed_files, 'python/') || contains(github.event.pull_request.changed_files, 'rust/') +# env: +# PYTHON: ${{ matrix.python-version }} +# steps: +# - uses: actions/checkout@v3 - - name: set up python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} +# - name: set up python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} - - name: Python unit tests - run: | - pip install -e ".[dev]" && pytest -v python/fastsim/tests/ - pytest -v python/fastsim/demos/ \ No newline at end of file +# - name: Python unit tests +# run: | +# pip install -e ".[dev]" && pytest -v python/fastsim/tests/ +# pytest -v python/fastsim/demos/ \ No newline at end of file diff --git a/.github/workflows/rust-tests.yaml b/.github/workflows/rust-tests.yaml index 7149f2f9..09896688 100644 --- a/.github/workflows/rust-tests.yaml +++ b/.github/workflows/rust-tests.yaml @@ -1,42 +1,42 @@ -name: rust-tests - -on: - push: - branches: [fastsim-2, fastsim-3] - pull_request: - workflow_dispatch: - workflow_call: - -jobs: - test: - # might not be needed - # if: github.repository == 'nrel/fastsim' - - runs-on: ubuntu-latest - - strategy: - fail-fast: true - # matrix: - # python-version: ['3.8', '3.9', '3.10'] - - # env: - # PYTHON: ${{ matrix.python-version }} - steps: - - uses: actions/checkout@v3 - - # - name: set up python ${{ matrix.python-version }} - # uses: actions/setup-python@v4 - # with: - # python-version: ${{ matrix.python-version }} - - # if: contains(github.event.pull_request.changed_files, 'rust/') - - name: install rust - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - - name: Rust unit tests - run: | - cd rust/ && cargo test \ No newline at end of file +# name: rust-tests + +# on: +# push: +# branches: [fastsim-2, fastsim-3] +# pull_request: +# workflow_dispatch: +# workflow_call: + +# jobs: +# test: +# # might not be needed +# # if: github.repository == 'nrel/fastsim' + +# runs-on: ubuntu-latest + +# strategy: +# fail-fast: true +# # matrix: +# # python-version: ['3.8', '3.9', '3.10'] + +# # env: +# # PYTHON: ${{ matrix.python-version }} +# steps: +# - uses: actions/checkout@v3 + +# # - name: set up python ${{ matrix.python-version }} +# # uses: actions/setup-python@v4 +# # with: +# # python-version: ${{ matrix.python-version }} + +# # if: contains(github.event.pull_request.changed_files, 'rust/') +# - name: install rust +# uses: actions-rs/toolchain@v1 +# with: +# profile: minimal +# toolchain: stable +# override: true + +# - name: Rust unit tests +# run: | +# cd rust/ && cargo test \ No newline at end of file diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 42986f52..3d8956fc 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -1,42 +1,43 @@ -# name: tests - -# on: -# push: -# branches: [fastsim-2, fastsim-3] -# pull_request: -# workflow_dispatch: - -# jobs: -# test: -# runs-on: ubuntu-latest - -# strategy: -# fail-fast: true -# matrix: -# python-version: ['3.8', '3.9', '3.10'] - -# env: -# PYTHON: ${{ matrix.python-version }} -# steps: -# - uses: actions/checkout@v3 - -# - name: set up python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} - -# - name: install rust -# uses: actions-rs/toolchain@v1 -# with: -# profile: minimal -# toolchain: stable -# override: true - -# - name: Rust unit tests -# run: | -# cd rust/ && cargo test - -# - name: Python unit tests -# run: | -# pip install -e ".[dev]" && pytest -v python/fastsim/tests/ -# pytest -v python/fastsim/demos/ \ No newline at end of file +name: tests + +on: + push: + branches: [fastsim-2, fastsim-3] + pull_request: + workflow_dispatch: + +jobs: + test: + if: github.repository == 'nrel/fastsim' + runs-on: ubuntu-latest + + strategy: + fail-fast: true + matrix: + python-version: ['3.8', '3.9', '3.10'] + + env: + PYTHON: ${{ matrix.python-version }} + steps: + - uses: actions/checkout@v3 + + - name: set up python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + + - name: install rust + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + + - name: Rust unit tests + run: | + cd rust/ && cargo test + + - name: Python unit tests + run: | + pip install -e ".[dev]" && pytest -v python/fastsim/tests/ + pytest -v python/fastsim/demos/ \ No newline at end of file diff --git a/.github/workflows/wheels.yaml b/.github/workflows/wheels.yaml index 9d3eb5c0..f93930e9 100644 --- a/.github/workflows/wheels.yaml +++ b/.github/workflows/wheels.yaml @@ -9,7 +9,8 @@ on: jobs: call-tests: - uses: nrel/fastsim/.github/workflows/rust-tests.yaml@main && nrel/fastsim/.github/workflows/py-tests.yaml@main + uses: nrel/fastsim/.github/workflows/tests.yaml@main + # nrel/fastsim/.github/workflows/rust-tests.yaml@main && nrel/fastsim/.github/workflows/py-tests.yaml@main build: name: build py3.${{ matrix.python-version }} on ${{ matrix.platform || matrix.os }} strategy: