-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Revert test matrix back to manual #111
Changes from all commits
1e50018
51d4010
0d44293
8fb7da0
d744ba6
102549c
a62d745
c9de494
16324a5
d449d2d
bfa4b66
5186c18
007e0a1
57050d2
956b25d
66a4245
6b36c22
b860ccf
2601768
6ffb6c5
efea53e
9c7a1dd
ceec4a3
51bdcff
537f817
0abac8a
fcb4c12
3dd02ed
2ecd7b0
c2109f4
38b8320
ca96eaf
ba6795f
e879faf
c871ad8
e1d47d5
a685a34
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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" | ||
|
@@ -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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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" | ||
|
@@ -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 }}/ | ||
IAlibay marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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 }} | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Something I had to do with the broken kits was bump up the conda-incubator/setup-miniconda version. I found a lot of times that v2 would fail with osx-arm64 for some reason or another. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 }}" }} | ||
lilyminium marked this conversation as resolved.
Show resolved
Hide resolved
lilyminium marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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 | ||
|
@@ -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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we have a set of setup instruction docs somewhere where we can put this? (not in this PR but let's raise an issue to get that done at some point :) ) |
||
# in the repository settings | ||
# (Obtain this from the Codecov website after setting up the repository there) | ||
token: {{ '${{ secrets.CODECOV_TOKEN }}' }} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think there's a thing with codecov v4 about this - not sure if we should/want to bump up the version (it might make things break even more!) |
||
# 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: | ||
|
@@ -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: | | ||
|
@@ -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: | | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you can be bothered, there's a few action versions that could be bumped up here (upload, download, and checkout can all go to v4, setup-miniconda I think would be good to bump to v3 [I know it doesn't play nice with macos-latest osx-arm64 runners])