Skip to content

Commit

Permalink
Merge branch 'master' into mlip
Browse files Browse the repository at this point in the history
  • Loading branch information
federicazanca authored May 21, 2024
2 parents a2ba334 + 60b04e6 commit e56c130
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dev-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: Dev CI

# For development, use the following instead:
on: [pull_request]
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
preview:
# This job is triggered by from PR from the aiida-registry repo, the developer of aiida-registry need to see the preview page of the PR
needs: [test-webpage-build, get-pr]
if: github.repository == 'aiidateam/aiida-registry'
if: "! github.event.pull_request.head.repo.fork "
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/plugin-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: Plugin CI

on:
pull_request_target:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:

- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.4.2
rev: v0.4.4
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix, --show-fixes]
Expand Down

0 comments on commit e56c130

Please sign in to comment.