Skip to content

Commit

Permalink
Merge branch 'master' into gb/macos-is-odd
Browse files Browse the repository at this point in the history
  • Loading branch information
DilumAluthge authored Oct 15, 2024
2 parents 9cb7e02 + 4d9da91 commit b789c9c
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- 'master'
- 'release-*'
tags: '*'
merge_group: # GitHub Merge Queue

concurrency:
# Skip intermediate builds: all builds except for builds on the `master` branch
Expand All @@ -15,7 +16,7 @@ concurrency:
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}

jobs:
finalize-pr-checks:
finalize:
if: always() # this line is important to keep the `finalize` job from being marked as skipped; do not change or delete this line
runs-on: ubuntu-latest
timeout-minutes: 10
Expand Down Expand Up @@ -46,7 +47,7 @@ jobs:
matrix:
julia-version:
- '1.6' # previous LTS
- '1.9' # TODO: comment out this line once I am finished debugging.
# - '1.9' # TODO: uncomment this line once we fix the tests on 1.9
- '1.10' # current LTS
# - '1.11' # TODO: uncomment this line once we fix the tests on 1.11
# - 'nightly' # TODO: decide whether we want to run any CI jobs on nightly.
Expand All @@ -67,9 +68,15 @@ jobs:
# TODO: remove the following once we fix the tests for 32-bit Julia on Windows.
- os: windows-latest
julia-arch: x86
#
# We don't have 32-bit builds of Julia for macOS:
- os: macos-latest
julia-arch: x86
#
# We don't have 32-bit builds of Julia for macOS:
- os: macos-latest
julia-arch: x86
#
# We don't need to run the coverage=false job for Julia < 1.9:
- julia-version: '1.6'
coverage: 'false'
Expand Down Expand Up @@ -107,6 +114,7 @@ jobs:
run: julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); include("docs/make.jl")'
build-mylib:
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: julia-actions/setup-julia@9b79636afcfb07ab02c256cede01fe2db6ba808c # v2.6.0
Expand Down

0 comments on commit b789c9c

Please sign in to comment.