Skip to content

Commit

Permalink
merge develop
Browse files Browse the repository at this point in the history
  • Loading branch information
rtimms committed Aug 31, 2023
2 parents d8dace3 + 840fb13 commit 9e513bf
Show file tree
Hide file tree
Showing 54 changed files with 2,048 additions and 1,485 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
6 changes: 6 additions & 0 deletions .github/workflows/benchmark_on_push.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
name: Run benchmarks on push
on:
push:
branches: [main, develop]
pull_request:

concurrency:
# Cancel intermediate builds always
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
benchmarks:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Fail the job if date < 20
if: env.TODAY < 20
uses: actions/github-script@v5
uses: actions/github-script@v6
with:
script: core.setFailed('This workflow should be triggered only at the end of the month, or else it will create a release for the wrong month.')

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lychee_url_checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

# use stable version for now to avoid breaking changes
- name: Lychee URL checker
uses: lycheeverse/lychee-action@v1.6.1
uses: lycheeverse/lychee-action@v1.8.0
with:
# arguments with file types to check
args: >-
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/periodic_benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
SUNDIALS_INST: $HOME/.local
LD_LIBRARY_PATH: $HOME/.local/lib
- name: Upload results as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: asv_new_results
path: results
Expand All @@ -63,7 +63,7 @@ jobs:
repository: pybamm-team/pybamm-bench
token: ${{ secrets.BENCH_PAT }}
- name: Download results artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: asv_new_results
path: new_results
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_periodic_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:

- name: Upload coverage report
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11
uses: codecov/codecov-action@v2.1.0
uses: codecov/codecov-action@v3.1.4

- name: Run integration tests
run: nox -s integration
Expand Down
Loading

0 comments on commit 9e513bf

Please sign in to comment.