From 963a4466888734800d082643b8981a4d687373b3 Mon Sep 17 00:00:00 2001 From: Jake Ireland Date: Tue, 5 Nov 2024 21:12:18 +1300 Subject: [PATCH] Prefer `just fmt` and paths-filter over julia-formatter action --- .JuliaFormatter.toml | 1 + .github/workflows/CI.yml | 32 ++++++++++++++++++++++++++------ justfile | 3 ++- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/.JuliaFormatter.toml b/.JuliaFormatter.toml index 3d80988..7ccf0ed 100644 --- a/.JuliaFormatter.toml +++ b/.JuliaFormatter.toml @@ -24,3 +24,4 @@ separate_kwargs_with_semicolon = false surround_whereop_typeparameters = true short_circuit_to_if = false disallow_single_arg_nesting = true +verbose = true \ No newline at end of file diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9601423..4742784 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,13 +1,17 @@ name: CI # Run on master, tags, or any pull request on: - schedule: - - cron: '0 2 * * *' # Daily at 2 AM UTC (8 PM CST) push: - branches: [master] - tags: ["*"] + branches: + - master + tags: ['*'] pull_request: - + workflow_dispatch: +concurrency: + # Skip intermediate builds: always. + # Cancel intermediate builds: only if it is a pull request build. + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} @@ -69,7 +73,23 @@ jobs: steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@latest - - uses: julia-actions/julia-format@v3 + - uses: extractions/setup-just@v1 # or taiki-e/install-action@just + + # Adapted from: + # github.com/FluxML/Flux.jl/blob/7be1ca7a/.github/workflows/JuliaFormatter.yml + - uses: dorny/paths-filter@v3 + id: filter + with: + filters: | + julia_file_change: + - added|modified: '**/*.jl' + - name: Apply JuliaFormatter + run: | + just fmt + - name: Check formatting diff + if: steps.filter.outputs.julia_file_change == 'true' + run: | + git diff --color=always --exit-code perf: name: Performance diff --git a/justfile b/justfile index 03ba677..eec0e98 100644 --- a/justfile +++ b/justfile @@ -46,7 +46,7 @@ bench: (instantiate-dev bench_dir) [group: 'ci'] fmt: # https://github.com/invenia/BlueStyle - julia --project=@JuliaFormatter -e 'using JuliaFormatter; format("{{project_dir}}", style=BlueStyle())' + julia --project=@JuliaFormatter -e 'import Pkg; Pkg.add("JuliaFormatter"); using JuliaFormatter; format("{{project_dir}}", style=BlueStyle())' # Instantiate main project instantiate: @@ -56,3 +56,4 @@ instantiate: [private] instantiate-dev dev_project_dir: julia --project={{dev_project_dir}} -e '{{dev_instantiate_code}}' +