Skip to content

Commit 3170b30

Browse files
committed
More CI tweaks, and temporarily disable some more CI jobs
1 parent da6917e commit 3170b30

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

.github/workflows/ci.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- 'master'
88
- 'release-*'
99
tags: '*'
10+
merge_group: # GitHub Merge Queue
1011

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

1718
jobs:
18-
finalize-pr-checks:
19+
finalize:
1920
if: always() # this line is important to keep the `finalize` job from being marked as skipped; do not change or delete this line
2021
runs-on: ubuntu-latest
2122
timeout-minutes: 10
@@ -46,7 +47,7 @@ jobs:
4647
matrix:
4748
julia-version:
4849
- '1.6' # previous LTS
49-
- '1.9' # TODO: comment out this line once I am finished debugging.
50+
# - '1.9' # TODO: uncomment this line once we fix the tests on 1.9
5051
- '1.10' # current LTS
5152
# - '1.11' # TODO: uncomment this line once we fix the tests on 1.11
5253
# - 'nightly' # TODO: decide whether we want to run any CI jobs on nightly.
@@ -67,9 +68,15 @@ jobs:
6768
# TODO: remove the following once we fix the tests for 32-bit Julia on Windows.
6869
- os: windows-latest
6970
julia-arch: x86
71+
#
7072
# We don't have 32-bit builds of Julia for macOS:
7173
- os: macos-latest
7274
julia-arch: x86
75+
#
76+
# We don't have 32-bit builds of Julia for macOS:
77+
- os: macos-latest
78+
julia-arch: x86
79+
#
7380
# We don't need to run the coverage=false job for Julia < 1.9:
7481
- julia-version: '1.6'
7582
coverage: 'false'
@@ -107,6 +114,7 @@ jobs:
107114
run: julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); include("docs/make.jl")'
108115
build-mylib:
109116
runs-on: ubuntu-latest
117+
timeout-minutes: 60
110118
steps:
111119
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
112120
- uses: julia-actions/setup-julia@9b79636afcfb07ab02c256cede01fe2db6ba808c # v2.6.0
@@ -123,4 +131,4 @@ jobs:
123131
make
124132
- run: ./examples/MyLib/my_application.out
125133
env:
126-
LD_LIBRARY_PATH: 'examples/MyLib/MyLibCompiled/lib'
134+
LD_LIBRARY_PATH: 'examples/MyLib/MyLibCompiled/lib'

0 commit comments

Comments
 (0)