Skip to content

Commit

Permalink
Revert test matrix back to manual (#111)
Browse files Browse the repository at this point in the history
* check tests fail

* update job name

* reset name back to main-tests

* rm dev

* change python matrix to manual

* is codecov the problem here?

* dont fail ci for codecov

* remove all dynamic python versions

* add codecov token?

* escape braces

* ignore codecov failure?

* upgrade act and allow codecov failure again

* add more comment to CI

* try changing the name of the package

* Revert "try changing the name of the package"

This reverts commit 57050d2.

* assert False

* tmp list directory

* downgrade act?

* rm assert False

* pass secret to act

* add actions workaround for secret

* try oidc?

* give up and try editing file to ignore upload failure

* Revert "rm assert False"

This reverts commit 2601768.

* Revert "Revert "rm assert False""

This reverts commit 51bdcff.

* Fix CI to fail and run appropriately (#116)

* tmp let CI run without codecov

* check directory exists

* make package and repo name markedly different

* tmp add assert False

* fix env value?

* fix path?

* fix var name

* add more listing

* even more listing

* am doofus

* rm some temporary changes

* add list back in

* tmp try fixes to check ci

* tmp simplify matrix

* allow os

* allow mdanalysis versions

* use manual python matrix

* Revert "tmp try fixes to check ci"

This reverts commit 613debe.

* Revert "Revert "tmp try fixes to check ci""

This reverts commit 5133e40.

* Revert "Revert "Revert "tmp try fixes to check ci"""

This reverts commit 38cf157.

* try v4

* bump act action?

* upgrade versions

* why isnt this running?

* reorder os?

* upgrade act all the way

* its called act-latest now?

* oops wrong place

* add p=false

* downgrade codecov back to v4, act back to 0.2.40, see how that goes

* Revert "upgrade versions"

This reverts commit 2ecd7b0.
  • Loading branch information
lilyminium authored May 27, 2024
1 parent a1a9201 commit 961a9f8
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 27 deletions.
7 changes: 6 additions & 1 deletion .github/actions/run-cookie-ci/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ inputs:
description: email associated with GitHub user
required: true
default: [email protected]
CODECOV_TOKEN:
description: Codecov token
required: true

runs:
using: "composite"
Expand Down Expand Up @@ -54,4 +57,6 @@ runs:
shell: bash
run: |
docker images
act --job main-tests --platform ubuntu-latest=act-conda
sed -i -e 's/fail_ci_if_error: true/fail_ci_if_error: false/g' .github/workflows/gh-ci.yaml
cat .github/workflows/gh-ci.yaml
act --job main-tests --platform ubuntu-latest=act-conda -s CODECOV_TOKEN=${{ inputs.CODECOV_TOKEN }} -p=false
12 changes: 10 additions & 2 deletions .github/workflows/gh-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ defaults:
env:
ARTIFACT_NAME: demo-mdakit-repos
OUTPUT_DIRECTORY: /home/runner/example_outputs
OUTPUT_COOKIE_SUBDIRECTORY: TestMDAKit_with_host_MDAnalysis_condaforge-deps_and_ReadTheDocs/mdakit-cookie
GH_USER: github-actions
GH_EMAIL: "[email protected]"
GH_REPOSITORY: "github.com/${{ github.repository }}.git"
Expand Down Expand Up @@ -60,19 +61,26 @@ jobs:
run: |
# --keep-test-outputs also saves the generated repositories
if [[ ${{ matrix.os }} == "ubuntu-latest" ]] ; then
PYTEST_FLAGS="--keep-test-outputs $OUTPUT_DIRECTORY"
PYTEST_FLAGS="--keep-test-outputs ${{ env.OUTPUT_DIRECTORY }}"
else
PYTEST_FLAGS=""
fi
echo "PYTEST_FLAGS=${PYTEST_FLAGS}"
pytest tests/ $PYTEST_FLAGS
- name: check cookie CI presence
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
ls -la ${{ env.OUTPUT_DIRECTORY }}/
ls -la ${{ env.OUTPUT_DIRECTORY }}/${{ env.OUTPUT_COOKIE_SUBDIRECTORY }}/
- name: Run cookie CI
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: ./.github/actions/run-cookie-ci
with:
source-directory: ${{ env.OUTPUT_DIRECTORY }}/TestMDAKit_with_host_MDAnalysis_condaforge-deps_and_ReadTheDocs/mdakit-cookie
source-directory: ${{ env.OUTPUT_DIRECTORY }}/${{ env.OUTPUT_COOKIE_SUBDIRECTORY }}
CODECOV_TOKEN: ${{ secrets.COOKIE_CODECOV_TOKEN }}

- name: Upload artifact
if: ${{ matrix.os == 'ubuntu-latest' && matrix.last-n-minor-python-release == 0 }}
Expand Down
2 changes: 1 addition & 1 deletion tests/test_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def test_write_outputs(
kitter = CookiecutterMDAKit(
project_name=project_name,
repo_name="mdakit-cookie",
package_name="mdakit_cookie",
package_name="cookiekit",
github_username="test-user-account",
github_host_account=github_host_account,
description=description,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,21 @@ defaults:
shell: bash {% if cookiecutter.__dependency_source != 'pip' %} -l {0} {% endif %}

jobs:
environment-config:
runs-on: ubuntu-latest
outputs:
stable-python-version: {{ "${{ steps.get-compatible-python.outputs.stable-python }}" }}
python-matrix: {{ "${{ steps.get-compatible-python.outputs.python-versions }}" }}
steps:
- uses: actions/setup-python@v4
with:
python-version: "3.11"

- id: get-compatible-python
uses: MDAnalysis/mdanalysis-compatible-python@main
with:
release: "latest"

main-tests:
if: "github.repository == '{{ cookiecutter.github_host_account }}/{{ cookiecutter.repo_name }}'"
needs: environment-config
runs-on: {{ '${{ matrix.os }}' }}
strategy:
fail-fast: false
matrix:
os: [macOS-latest, ubuntu-latest, windows-latest]
python-version: {% raw %}${{ fromJSON(needs.environment-config.outputs.python-matrix) }}{% endraw %}
os: [ubuntu-latest, macOS-latest, windows-latest]
mdanalysis-version: ["latest", "develop"]
python-version: ["3.10", "3.11", "3.12"]
exclude:
# Entries here exclude particular combinations of the matrix
# Edit or remove as particular combinations come into or out of date
# Below we exclude runs with the latest release and Python 3.12
- mdanalysis-version: "latest"
python-version: "3.12"

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -123,11 +113,19 @@ jobs:
file: coverage.xml
name: codecov-{{ '${{ matrix.os }}' }}-py{{ '${{ matrix.python-version }}' }}
verbose: True
# to upload coverage reports, set a secret called CODECOV_TOKEN
# in the repository settings
# (Obtain this from the Codecov website after setting up the repository there)
token: {{ '${{ secrets.CODECOV_TOKEN }}' }}
# To fail the CI if there's an error, keep this set to true
# If repository forks need to run CI, you may need to set this to false
# Forks can't access the CODECOV_TOKEN secret,
# and a failed upload registers as an error
fail_ci_if_error: true


pylint_check:
if: "github.repository == '{{ cookiecutter.github_host_account }}/{{ cookiecutter.repo_name }}'"
needs: environment-config
runs-on: ubuntu-latest

steps:
Expand All @@ -136,7 +134,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: {{ '${{ needs.environment-config.outputs.stable-python-version }}' }}
python-version: "3.11"

- name: Install Pylint
run: |
Expand All @@ -153,16 +151,15 @@ jobs:
pypi_check:
if: "github.repository == '{{ cookiecutter.github_host_account }}/{{ cookiecutter.repo_name }}'"
needs: environment-config
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Set up Python {{ '${{ needs.environment-config.outputs.stable-python-version }}' }}
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: {{ '${{ needs.environment-config.outputs.stable-python-version }}' }}
python-version: "3.11"

- name: Install dependencies
run: |
Expand Down

0 comments on commit 961a9f8

Please sign in to comment.