Skip to content

Commit

Permalink
Merge branch 'master' into tb-logging
Browse files Browse the repository at this point in the history
  • Loading branch information
MilesCranmer committed Nov 8, 2024
2 parents 5a759d5 + 6c5c74e commit 5052239
Show file tree
Hide file tree
Showing 95 changed files with 8,335 additions and 2,057 deletions.
32 changes: 17 additions & 15 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,38 @@ jobs:
test:
name: Julia ${{ matrix.julia-version }}-${{ matrix.os }}-${{ matrix.test }}-${{ github.event_name }}
runs-on: ${{ matrix.os }}
timeout-minutes: 120
timeout-minutes: 240
strategy:
fail-fast: false
matrix:
test:
- "unit"
- "integration"
- "part1"
- "part2"
- "part3"
julia-version:
- "1.6"
- "1.8"
- "1.10"
- "1"
os:
- ubuntu-latest
include:
- os: windows-latest
julia-version: "1"
test: "unit"
test: "part1"
- os: windows-latest
julia-version: "1"
test: "integration"
test: "part2"
- os: windows-latest
julia-version: "1"
test: "part3"
- os: macOS-latest
julia-version: "1"
test: "unit"
test: "part1"
- os: macOS-latest
julia-version: "1"
test: "integration"
- os: ubuntu-latest
julia-version: "~1.11.0-0"
test: "unit"
- os: ubuntu-latest
julia-version: "~1.11.0-0"
test: "integration"
test: "part2"
- os: macOS-latest
julia-version: "1"
test: "part3"

steps:
- uses: actions/checkout@v4
Expand All @@ -62,6 +62,8 @@ jobs:
version: ${{ matrix.julia-version }}
- name: "Cache dependencies"
uses: julia-actions/cache@v2
with:
cache-name: julia-cache;workflow=${{ github.workflow }};job=${{ github.job }};os=${{ matrix.os }};julia=${{ matrix.julia-version }};project=${{ hashFiles('**/Project.toml') }}
- name: "Build package"
uses: julia-actions/julia-buildpkg@v1
- name: "Run tests"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: Documentation
# Modelled from DiffEqDocs

on:
push:
Expand Down Expand Up @@ -30,6 +29,7 @@ jobs:
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- name: "Build and deploy"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
run: julia --project=docs/ docs/make.jl
DOCUMENTER_KEY_ASTROAUTOMATA: ${{ secrets.DOCUMENTER_KEY }}
DOCUMENTER_KEY_CAM: ${{ secrets.DAMTP_DEPLOY_KEY }}
run: |
julia --project=docs/ docs/make.jl
6 changes: 1 addition & 5 deletions .github/workflows/check-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,8 @@ jobs:
- name: "Cache dependencies"
uses: julia-actions/cache@v2
- name: Install JuliaFormatter and format
# This will use the latest version by default but you can set the version like so:
#
# julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter", version="0.13.0"))'
run: |
julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter"))'
julia -e 'using JuliaFormatter; format(".", verbose=true)'
julia --startup-file=no -e 'using Pkg; pkg"activate --temp"; pkg"add [email protected]"; using JuliaFormatter; format("."; verbose=true)'
- name: "Format check"
run: |
julia -e '
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fix-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
julia -e 'using JuliaFormatter; format(".")'
- name: "Create Pull Request"
id: cpr
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: Format .jl files
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
.dataset*.jl
.hyperparams*.jl
outputs
*.csv
*.bak
*.bkup
performance*txt
*.out
trials*
**/__pycache__
build
dist
Manifest.toml
Manifest*.toml
*.cov
.coveralls.yml
**/*tmp*.jl
Expand All @@ -20,3 +22,4 @@ docs/src/index.md
*.code-workspace
.vscode
**/*.json
LocalPreferences.toml
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/domluna/JuliaFormatter.jl
rev: v1.0.56
rev: v1.0.61
hooks:
- id: julia-formatter
- repo: https://github.com/pre-commit/mirrors-prettier
Expand Down
Loading

0 comments on commit 5052239

Please sign in to comment.