Skip to content

Commit fd071e7

Browse files
committed
merge
2 parents ab7963e + 67d10e9 commit fd071e7

File tree

2,603 files changed

+103593
-292679
lines changed

Some content is hidden

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

2,603 files changed

+103593
-292679
lines changed

.air.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[format]
2+
line-width = 80
3+
indent-width = 2
4+
indent-style = "space"
5+
line-ending = "auto"
6+
persistent-line-breaks = true
7+
exclude = []
8+
default-exclude = true

.github/DISCUSSION_TEMPLATE/feature-requests.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ body:
44
- type: markdown
55
attributes:
66
value: |
7+
Welcome to the Quarto CLI GitHub repository!
8+
We are always happy to hear feedback from our users.
9+
10+
This is the repository for the command-line program `quarto`:
11+
12+
- If you're reporting an issue with the **Visual Editor** or with the **Visual Studio Code / Positron extension**, please visit https://github.com/quarto-dev/quarto
13+
- If you're reporting an issue inside **RStudio**, please visit https://github.com/rstudio/rstudio
14+
- If you're reporting an issue inside **Positron**, please visit https://github.com/posit-dev/positron
15+
- If you want to ask for help, please use the [Q&A GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/q-a).
16+
717
First, please check [Quarto Issues](https://github.com/quarto-dev/quarto-cli/issues) and [Feature Requests GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/feature-requests) to see if your feature request has already been discussed.
818
If it has, please consider adding a comment to the existing discussion instead of creating a new one.
919

.github/DISCUSSION_TEMPLATE/q-a.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,17 @@ body:
33
- type: markdown
44
attributes:
55
value: |
6-
First, please check [Quarto Issues](https://github.com/quarto-dev/quarto-cli/issues) and [Q&A GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/q-a) first to see if your question has already been asked.
6+
Welcome to the Quarto CLI GitHub repository!
7+
We are always happy to hear feedback from our users.
8+
9+
This is the repository for the command-line program `quarto`:
10+
11+
- If you're reporting an issue with the **Visual Editor** or with the **Visual Studio Code / Positron extension**, please visit https://github.com/quarto-dev/quarto
12+
- If you're reporting an issue inside **RStudio**, please visit https://github.com/rstudio/rstudio
13+
- If you're reporting an issue inside **Positron**, please visit https://github.com/posit-dev/positron
14+
- If you want to ask for a feature, please use the [Feature Requests GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/feature-requests).
15+
16+
First, please check [Quarto Issues](https://github.com/quarto-dev/quarto-cli/issues) and [Q&A GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/q-a) to see if your question has already been asked.
717
If it has, please consider adding a comment to the existing discussion instead of creating a new one.
818
919
After checking, if you are not sure if your question has already been asked, please create a new discussion.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,60 @@ body:
66
- type: markdown
77
attributes:
88
value: |
9-
Welcome to the quarto GitHub repository!
9+
Welcome to the Quarto CLI GitHub repository!
1010
We are always happy to hear feedback from our users.
1111
1212
This is the repository for the command-line program `quarto`:
1313
14-
- If you're reporting an issue with the VS Code extension, please visit https://github.com/quarto-dev/quarto
15-
- If you're reporting an issue inside RStudio, please visit https://github.com/rstudio/rstudio
14+
- If you're reporting an issue with the **Visual Editor** or with the **Visual Studio Code / Positron extension**, please visit https://github.com/quarto-dev/quarto
15+
- If you're reporting an issue inside **RStudio**, please visit https://github.com/rstudio/rstudio
16+
- If you're reporting an issue inside **Positron**, please visit https://github.com/posit-dev/positron
17+
- If you want to ask for a feature, please use the [Feature Requests GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/feature-requests).
18+
- If you want to ask for help, please use the [Q&A GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/q-a).
1619
1720
Quarto is under active development!
1821
If convenient, we'd appreciate if you could check that the issue persists on the [latest pre-release](https://github.com/quarto-dev/quarto-cli/releases).
1922
2023
Finally, so that we can get the most out of your bug report, consider reading our ["Bug Reports" guide](https://quarto.org/bug-reports.html).
2124
22-
If you want to ask for a feature, please use the [Feature Requests GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/feature-requests).
23-
If you want to ask for help, please use the [Q&A GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/q-a).
24-
2525
Thank you for using Quarto!
2626
2727
---
2828
2929
You can share a Quarto document using the following syntax, _i.e._, using more backticks than you have in your document (usually four ` ```` `).
3030
For example with Quarto CLI >=1.5:
3131
32-
`````md
33-
````qmd
34-
---
35-
title: "Reproducible Quarto Document"
36-
format: html
37-
engine: jupyter
38-
---
39-
40-
This is a reproducible Quarto document using `format: html`.
41-
It is written in Markdown and contains embedded Python code.
42-
When you run the code, it will produce a message.
43-
44-
```{python}
45-
print("Hello, world!")
46-
```
47-
48-
![An image]({{< placeholder 600 400 >}}){#fig-placeholder}
49-
50-
{{< lipsum 1 >}}
51-
52-
A reference to @fig-placeholder.
53-
54-
The end.
55-
````
56-
`````
32+
````qmd
33+
---
34+
title: "Reproducible Quarto Document"
35+
format: html
36+
engine: jupyter
37+
---
38+
39+
This is a reproducible Quarto document using `format: html`.
40+
It is written in Markdown and contains embedded Python code.
41+
When you run the code, it will produce a message.
42+
43+
```{python}
44+
print("Hello, world!")
45+
```
46+
47+
![An image]({{< placeholder 600 400 >}}){#fig-placeholder}
48+
49+
{{< lipsum 1 >}}
50+
51+
A reference to @fig-placeholder.
52+
53+
The end.
54+
````
55+
56+
- type: checkboxes
57+
attributes:
58+
label: "I have:"
59+
options:
60+
- label: searched the issue tracker for similar issues
61+
- label: installed the latest version of [Quarto CLI](https://github.com/quarto-dev/quarto-cli/releases/latest)
62+
- label: formatted my issue following the [Bug Reports guide](https://quarto.org/bug-reports.html)
5763

5864
- type: textarea
5965
attributes:
@@ -98,13 +104,13 @@ body:
98104
99105
- type: textarea
100106
attributes:
101-
label: Expected behavior
102-
description: Tell us what should happen.
107+
label: Actual behavior
108+
description: Tell us what happens instead.
103109

104110
- type: textarea
105111
attributes:
106-
label: Actual behavior
107-
description: Tell us what happens instead.
112+
label: Expected behavior
113+
description: Tell us what should happen.
108114

109115
- type: textarea
110116
attributes:
Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,49 @@
1-
name: "Cache Typst package"
1+
name: "Restore any Typst package cache"
22
description: "Configures the caching for Typst packages"
3+
outputs:
4+
cache-hit:
5+
description: "Was a cache found with primary key ?"
6+
value: ${{ steps.cache-typst-restore.outputs.cache-hit }}
7+
cache-primary-key:
8+
description: "Key of the cache to find and save"
9+
value: ${{ steps.cache-typst-restore.outputs.cache-primary-key }}
10+
cache-matched-key:
11+
description: "Key of the cache found and used."
12+
value: ${{ steps.cache-typst-restore.outputs.cache-matched-key }}
13+
cache-path:
14+
description: "where is the packages cache for typst ?"
15+
value: ${{ steps.cache-typst-path.outputs.TYPST_CACHE }}
316

417
runs:
518
using: "composite"
619
steps:
720
- name: Typst Cache path
21+
id: cache-typst-path
822
run: |
923
case $RUNNER_OS in
1024
"Linux")
11-
echo "TYPST_CACHE=${XDG_CACHE_HOME:-~/.cache}/typst/packages/" >> $GITHUB_ENV
25+
typst_cache="${XDG_CACHE_HOME:-~/.cache}/typst/packages/"
1226
;;
1327
"macOS")
14-
echo "TYPST_CACHE=~/Library/Caches/typst/packages/" >> $GITHUB_ENV
28+
typst_cache="~/Library/Caches/typst/packages/"
1529
;;
1630
"Windows")
17-
echo "TYPST_CACHE=$LOCALAPPDATA/typst/packages/" >> $GITHUB_ENV
31+
typst_cache="$LOCALAPPDATA/typst/packages/"
1832
;;
1933
*)
2034
echo "$RUNNER_OS not supported"
2135
exit 1
2236
;;
2337
esac
38+
echo "TYPST_CACHE=${typst_cache}" >> $GITHUB_ENV
39+
echo "TYPST_CACHE=${typst_cache}" >> $GITHUB_OUTPUT
2440
shell: bash
2541

2642
- name: Cache Typst package folder
27-
uses: actions/cache@v4
43+
id: cache-typst-restore
44+
uses: actions/cache/restore@v4
2845
with:
2946
path: ${{ env.TYPST_CACHE }}
30-
key: ${{ runner.os }}-typst-1-${{ github.run_id }}
47+
key: ${{ runner.os }}-typst-1
3148
restore-keys: |
32-
${{ runner.os }}-typst-1-
33-
save-always: true
49+
${{ runner.os }}-typst-
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Prevent Workflow Re-run
2+
description: Fails if the workflow is re-run (github.run_attempt > 1)
3+
runs:
4+
using: "composite"
5+
steps:
6+
- name: Prevent any re-run
7+
if: ${{ github.run_attempt > 1 }}
8+
run: |
9+
echo "::error::Re-running jobs is not permitted. Please trigger a new build manually at https://github.com/quarto-dev/quarto-cli/actions/workflows/create-release.yml (click 'Run workflow'), or use the GitHub CLI: 'gh workflow run create-release.yml'"
10+
exit 1
11+
shell: bash

.github/workflows/actions/quarto-dev/action.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ runs:
88
uses: actions/cache@v4
99
with:
1010
path: ./src/resources/deno_std/cache
11-
key: ${{ runner.os }}-deno_std-1-${{ hashFiles('./src/resources/deno_std/deno_std.lock', './package/scripts/deno_std/deno_std.ts') }}
11+
key: ${{ runner.os }}-deno_std-2-${{ hashFiles('./src/resources/deno_std/deno_std.lock', './package/scripts/deno_std/deno_std.ts') }}
1212
restore-keys: |
13-
${{ runner.os }}-deno_std-1-
14-
${{ runner.os }}-deno_std-
13+
${{ runner.os }}-deno_std-2-
1514
1615
- name: Configure Quarto (.sh)
1716
if: runner.os != 'Windows'

0 commit comments

Comments
 (0)