Skip to content
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.

Sign up for GitHub

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

GHA: Fix test-install workflow #6409

Merged
merged 3 commits into from
May 22, 2024
Merged

GHA: Fix test-install workflow #6409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8c5e37
GHA: Fix test-install workflow
danielhollas May 22, 2024
7cb4d0d
Fix sphinxext test
danielhollas May 22, 2024
04677ce
Fix artifact upload
danielhollas May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/test-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,10 @@ jobs:
run: sudo apt update && sudo apt install postgresql graphviz

- name: Install aiida-core
uses: .github/actions/install-aiida-core
uses: ./.github/actions/install-aiida-core
with:
python-version: ${{ matrix.python-version }}
extras: '[atomic_tools, docs, notebook, rest, tests, tui]'
extras: '[atomic_tools,docs,notebook,rest,tests,tui]'
from-requirements: 'false'

- name: Setup AiiDA environment
Expand All @@ -239,7 +239,7 @@ jobs:
# updating the requirements (in case they are inconsistent with the pyproject.toml file).
- uses: actions/upload-artifact@v4
with:
name: requirements.txt
name: requirements-py-${{ matrix.python-version }}.txt
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

upload-artifact@v4 no longer allows uploading multiple artifacts under the same name.

path: requirements-py-${{ matrix.python-version }}.txt

# Check whether the requirements/ files are consistent with the dependency specification in the pyproject.toml file.
Expand Down Expand Up @@ -293,7 +293,8 @@ jobs:
if: steps.check_reqs.outcome == 'Failure' # only run if requirements/ are inconsistent
uses: actions/download-artifact@v4
with:
name: requirements.txt
pattern: requirements-py-*
merge-multiple: true
path: requirements

- name: Commit requirements files
Expand Down
1 change: 1 addition & 0 deletions tests/sphinxext/test_workchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def test_workchain_build(sphinx_build_factory, file_regression):
# Need to remove the ``source`` attribute of the ``document`` tag as that is variable.
output = (sphinx_build.outdir / 'index.xml').read_text()
output = re.sub(r'source=".*"', '', output)
output = re.sub(r'<!-- Generated by Docutils.*-->', '<!-- Generated by Docutils -->', output)

file_regression.check(output, encoding='utf-8', extension='.xml')

Expand Down
2 changes: 1 addition & 1 deletion tests/sphinxext/test_workchain/test_workchain_build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
<!-- Generated by Docutils 0.20.1 -->
<!-- Generated by Docutils -->
<document >
<section ids="sphinx-aiida-demo" names="sphinx-aiida\ demo">
<title>sphinx-aiida demo</title>
Expand Down
Loading