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

Jump to bottom

Update ci.yml #1045

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Update ci.yml #1045

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
08c8f26
Update ci.yml
rieder Apr 23, 2024
1c680b2
Update lint.yml
rieder Apr 23, 2024
ed11f24
Update ci.yml
rieder Apr 23, 2024
b9e88ce
Update ci.yml
rieder Apr 23, 2024
834afb2
Update cffconvert.yml
rieder Apr 23, 2024
8ef554d
Update ci.yml
rieder Apr 24, 2024
4c4a0ef
Update lint.yml
rieder May 1, 2024
6a7bf4f
Merge branch 'main' into updates/ci-workflow
rieder May 8, 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
2 changes: 1 addition & 1 deletion .github/workflows/cffconvert.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out a copy of the repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Check whether the citation metadata from CITATION.cff is valid
uses: citation-file-format/[email protected]
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- mpich
- openmpi
os:
- ubuntu-22.04
# - ubuntu-22.04
- ubuntu-20.04
# macOS is not ready yet - needs other setup of prerequisites
# - macos-12
Expand All @@ -33,7 +33,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup MPI
id: setup-mpi
Expand All @@ -52,14 +52,14 @@ jobs:
run: ompi_info
if: ${{ matrix.mpi == 'openmpi' }}

- name: Set up JDK 1.8
uses: actions/setup-java@v3.9.0
- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '17'

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
cache: 'pip'
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.8

- name: Install Python dependencies
run: pip install flake8
run: pip install flake8 black

- name: Run linters
uses: wearerequired/lint-action@v2
with:
black: true
flake8: true
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we only call black then, and not flake8?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is just for checking, not fixing. So I don't mind running both. For fixing syntax we should make a choice.

Loading