From ca69bfad5ba13c172ccc906b0f2e22b4bc0691db Mon Sep 17 00:00:00 2001 From: Michael Goerz Date: Tue, 17 Oct 2023 00:36:49 -0400 Subject: [PATCH] Consolidate workflows --- .github/workflows/SpellCheck.yml | 20 -------------------- .github/workflows/ci.yml | 30 ++++++++++++++++-------------- 2 files changed, 16 insertions(+), 34 deletions(-) delete mode 100644 .github/workflows/SpellCheck.yml diff --git a/.github/workflows/SpellCheck.yml b/.github/workflows/SpellCheck.yml deleted file mode 100644 index c940e1e..0000000 --- a/.github/workflows/SpellCheck.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Spell Check -on: - push: - branches: - - master - - 'release-*' - tags: - - '*' - pull_request: - branches: - - master -jobs: - typos-check: - name: Spell Check with Typos - runs-on: ubuntu-latest - steps: - - name: Checkout Actions Repository - uses: actions/checkout@v4 - - name: Check spelling - uses: crate-ci/typos@master diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4f42ab..a74996e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: os: windows-latest version: '1' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} @@ -53,11 +53,11 @@ jobs: fail-fast: false matrix: include: - - title: 'Linux - LTS' + - title: 'Linux - Oldest' os: ubuntu-latest version: '1.6' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} @@ -76,7 +76,7 @@ jobs: statuses: write pages: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: version: '1' @@ -95,7 +95,7 @@ jobs: name: Codestyle runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: version: '1' @@ -106,19 +106,21 @@ jobs: run: | julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter"))' julia -e 'using JuliaFormatter; format(["src", "docs", "test", "devrepl.jl"], verbose=true)' - - name: Format check + - name: Format Check + shell: julia {0} run: | - julia -e ' out = Cmd(`git diff -U0`) |> read |> String if out == "" exit(0) else @error "Some files have not been formatted !!!\n\n$out" exit(1) - end' - - name: Version check + end + - name: Spell Check + uses: crate-ci/typos@master + - name: Version Check + shell: julia {0} run: | - julia -e ' using Pkg VERSION = VersionNumber(Pkg.TOML.parsefile("Project.toml")["version"]) BRANCH = ENV["GITHUB_REF_NAME"] @@ -139,10 +141,10 @@ jobs: else println("Version $VERSION OK on $BRANCH") end - exit(0)' - - name: Changelog check + exit(0) + - name: Changelog Check + shell: julia {0} run: | - julia -e ' using Pkg using Dates VERSION = VersionNumber(Pkg.TOML.parsefile("Project.toml")["version"]) @@ -184,4 +186,4 @@ jobs: end end println("NEWS.md OK") - exit(0)' + exit(0)