Skip to content

Commit 1d52ed1

Browse files
authored
Merge branch 'main' into as/execute-dir
2 parents a30df59 + 99c7a5d commit 1d52ed1

File tree

166 files changed

+7388
-430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+7388
-430
lines changed

.ci/Project.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
[deps]
2+
Changelog = "5217a498-cd5d-4ec6-b8c2-9b85a09b6e3e"
23
JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
4+
5+
[compat]
6+
Changelog = "1"
7+
JuliaFormatter = "1"
8+
julia = "1"

.ci/changelog.jl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import Changelog
2+
3+
cd(dirname(@__DIR__)) do
4+
Changelog.generate(
5+
Changelog.CommonMark(),
6+
"CHANGELOG.md";
7+
repo = "PumasAI/QuartoNotebookRunner.jl",
8+
)
9+
end

.ci/format.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ cd(dirname(@__DIR__)) do
99
for file in files
1010
fullpath = joinpath(root, file)
1111
fullpath_lowercase = lowercase(fullpath)
12-
if endswith(fullpath_lowercase, ".jl")
12+
if endswith(fullpath_lowercase, ".jl") &&
13+
!contains(fullpath_lowercase, "vendor")
1314
is_formatted = JuliaFormatter.format(fullpath)
1415
if is_formatted
1516
push!(formatted_paths, fullpath)

.github/workflows/CI.yml

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
matrix:
4545
version:
4646
- "1.6"
47-
- "1.10"
47+
- "1.11"
4848
os:
4949
- ubuntu-latest
5050
- macos-13
@@ -58,39 +58,55 @@ jobs:
5858
os: macos-13
5959
- version: "1.6"
6060
os: windows-latest
61+
# Performance regressions on Julia 1.11 on Windows. Currently not
62+
# viable to run the test suite there.
63+
- version: "1.11"
64+
os: windows-latest
6165
include:
6266
- version: "1.7"
6367
os: macos-13
6468
- version: "1.7"
6569
os: windows-latest
70+
- version: "1.10"
71+
os: windows-latest
6672
steps:
67-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
73+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6874
with:
6975
persist-credentials: false
7076

71-
- uses: julia-actions/setup-julia@512e2ab44f5848ea62bddd21d1ee906e989b0360 # v2.4.0
77+
- uses: julia-actions/install-juliaup@1da6847c869cd68e3a32b8f52fe8f005b8cd5ece # v2.2.1
7278
with:
73-
version: ${{ matrix.version }}
74-
- uses: julia-actions/cache@8608484607cba0bdb5437a7bad85d6502499d029 # v2.0.4
79+
channel: "${{ matrix.version }}"
80+
81+
# These versions of `julia` are used for the cross-version notebook tests.
82+
- run: juliaup add 1.9.4
83+
- run: juliaup add 1.10.7
84+
- run: juliaup add 1.11.2
85+
86+
- uses: julia-actions/cache@2b1bf4d8a138668ac719ea7ca149b53ed8d8401e # v2.0.7
7587

76-
- uses: r-lib/actions/setup-r@e6be4b3706e0f39bc7a4cf4496a5f2c4cb840040 # v2.10.1
88+
- uses: r-lib/actions/setup-r@14a7e741c1cb130261263aa1593718ba42cf443b # v2.11.2
7789
with:
7890
use-public-rspm: true
7991
r-version: "4.3"
8092
- run: echo "LD_LIBRARY_PATH=$(R RHOME)/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
8193
if: matrix.os == 'ubuntu-latest'
94+
- run: julia -e 'cp("/usr/lib/x86_64-linux-gnu/libstdc++.so.6", joinpath(dirname(Sys.BINDIR), "lib", "julia", "libstdc++.so.6"); force = true)'
95+
if: matrix.os == 'ubuntu-latest' && matrix.version == '1.6'
8296

8397
# TODO: use quarto_jll for integration tests once modern enough versions are available
84-
- uses: quarto-dev/quarto-actions/setup@87b35bb88b36317fa36b5189e9553b4164a5c5a3 # v2.1.6
98+
- uses: quarto-dev/quarto-actions/setup@9e48da27e184aa238fcb49f5db75469626d43adb # v2.1.9
8599
with:
86100
version: pre-release
87101

88-
- uses: julia-actions/julia-buildpkg@90dd6f23eb49626e4e6612cb9d64d456f86e6a1c # v1.6.0
89-
- uses: julia-actions/julia-runtest@d0c4f093badade621cd041bba567d1e832480ac2 # v1.10.0
102+
- uses: julia-actions/julia-buildpkg@e3eb439fad4f9aba7da2667e7510e4a46ebc46e1 # v1.7.0
103+
- uses: julia-actions/julia-runtest@678da69444cd5f13d7e674a90cb4f534639a14f9 # v1.11.2
90104
with:
91105
depwarn: "yes"
92106
- uses: julia-actions/julia-processcoverage@03114f09f119417c3242a9fb6e0b722676aedf38 # v1.2.2
93-
- uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
107+
if: matrix.os == 'ubuntu-latest' && matrix.version == '1.11'
108+
- uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
109+
if: matrix.os == 'ubuntu-latest' && matrix.version == '1.11'
94110
with:
95111
verbose: true
96112
files: lcov.info
@@ -102,10 +118,10 @@ jobs:
102118
timeout-minutes: 20
103119

104120
steps:
105-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
121+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
106122
with:
107123
persist-credentials: false
108-
- uses: julia-actions/setup-julia@512e2ab44f5848ea62bddd21d1ee906e989b0360 # v2.4.0
124+
- uses: julia-actions/setup-julia@5c9647d97b78a5debe5164e9eec09d653d29bd71 # v2.6.1
109125
with:
110126
version: "1"
111127
- run: |

.github/workflows/CompatHelper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
CompatHelper:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: julia-actions/setup-julia@512e2ab44f5848ea62bddd21d1ee906e989b0360 # v2.4.0
13+
- uses: julia-actions/setup-julia@5c9647d97b78a5debe5164e9eec09d653d29bd71 # v2.6.1
1414
with:
1515
version: '1'
1616
- name: "Install CompatHelper"
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: "Enforce changelog"
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
5+
6+
jobs:
7+
changelog:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
11+
- uses: julia-actions/setup-julia@5c9647d97b78a5debe5164e9eec09d653d29bd71 # v2.6.1
12+
with:
13+
version: '1'
14+
- uses: dangoslen/changelog-enforcer@204e7d3ef26579f4cd0fd759c57032656fdf23c7 # v3.6.1
15+
with:
16+
changeLogPath: 'CHANGELOG.md'
17+
skipLabels: 'skip-changelog'
18+
- run: julia --project=.ci -e 'using Pkg; Pkg.instantiate()'
19+
- run: julia --project=.ci .ci/changelog.jl
20+
- run: git diff --exit-code

.github/workflows/TagBot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: JuliaRegistries/TagBot@da659ec760f7ae7b8b56b51543028ed31b7d1943 # v1.19.2
28+
- uses: JuliaRegistries/TagBot@1fbd4dada368d95c57aed9b607db86599f9634e6 # v1.20.1
2929
with:
3030
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/VendorUpdater.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: VendorUpdater
2+
on:
3+
schedule:
4+
- cron: 0 0 * * *
5+
workflow_dispatch:
6+
permissions:
7+
contents: write
8+
pull-requests: write
9+
jobs:
10+
VendorUpdater:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
14+
with:
15+
persist-credentials: false
16+
17+
- uses: julia-actions/setup-julia@5c9647d97b78a5debe5164e9eec09d653d29bd71 # v2.6.1
18+
with:
19+
version: '1'
20+
21+
- name: "Update dependencies"
22+
run: import Pkg; Pkg.update()
23+
shell: julia --project=src/QuartoNotebookWorker/src/vendor --color=yes {0}
24+
25+
- name: "Run vendor script"
26+
run: julia --project=src/QuartoNotebookWorker/src/vendor --color=yes src/QuartoNotebookWorker/src/vendor/vendor.jl
27+
28+
- name: "Create pull request"
29+
uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # v7.0.7
30+
with:
31+
token: ${{ secrets.GITHUB_TOKEN }}
32+
commit-message: "Automatic update of vendored dependencies"
33+
title: "Automatic update of vendored dependencies"
34+
labels: |
35+
vendor
36+
dependencies
37+
body: |-
38+
This pull request updates all vendored packages.
39+
branch-suffix: random
40+
delete-branch: true

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@ Manifest.toml
77
*.png
88
*.jls
99
.DS_Store
10-
!/test/assets/*
10+
.CondaPkg
11+
.cache
12+
!/test/assets/*
13+
!/src/QuartoNotebookWorker/src/vendor/Manifest.toml

0 commit comments

Comments
 (0)