Skip to content

Commit 26ef8b6

Browse files
authored
Merge branch 'main' into docs/number-offset-html-only
2 parents 8986ec4 + a492383 commit 26ef8b6

File tree

1,880 files changed

+146264
-38084
lines changed

Some content is hidden

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

1,880 files changed

+146264
-38084
lines changed

.github/DISCUSSION_TEMPLATE/feature-requests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
title: "<The (missing) feature you want to discuss>"
1+
title: "The (missing) feature you want to discuss"
2+
labels: ["enhancement"]
23
body:
34
- type: markdown
4-
attributes:
5+
attributes:
56
value: |
67
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.
78
If it has, please consider adding a comment to the existing discussion instead of creating a new one.

.github/DISCUSSION_TEMPLATE/q-a.yml

Lines changed: 48 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,73 @@
1-
title: "<Your question in one sentence (e.g., How do I preview documents with Quarto?)>"
1+
title: "Your question in one sentence (e.g., How do I preview documents with Quarto?)"
22
body:
33
- type: markdown
4-
attributes:
4+
attributes:
55
value: |
66
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.
77
If it has, please consider adding a comment to the existing discussion instead of creating a new one.
88
99
After checking, if you are not sure if your question has already been asked, please create a new discussion.
1010
We look forward to hearing from you.
1111
12-
Finally, try to describe the best you can what you want to achieve or what is your issue, especially by providing a complete self-contained reproducible example (as demonstrated in the below form).
12+
Finally, try to describe the best you can what you want to achieve or what is your issue, especially by providing a complete self-contained reproducible example (consider reading our ["Bug Reports" guide](https://quarto.org/bug-reports.html)).
1313
This will help us to understand your question and answer it.
1414
15+
`````md
16+
````qmd
17+
---
18+
title: "Reproducible Quarto Document"
19+
format: html
20+
engine: jupyter
21+
---
22+
23+
This is a reproducible Quarto document using `format: html`.
24+
It is written in Markdown and contains embedded Python code.
25+
When you run the code, it will produce a message.
26+
27+
```{python}
28+
print("Hello, world!")
29+
```
30+
31+
![A placeholder image](https://placehold.co/600x400.png)
32+
33+
The end.
34+
````
35+
`````
36+
37+
You can add some additional information that can help us to help you:
38+
39+
- What Quarto version are you using?
40+
You can find the version of Quarto you used by running `quarto --version` in your terminal.
41+
- What operating system are you using?
42+
Linux Ubuntu 20.04, macOS 11.2.3, Windows 10, _etc._
43+
1544
_Thank you for opening this discussion either to ask for help or to report a possible bug!_
1645
- type: textarea
1746
attributes:
1847
label: Description
1948
description: Start your question/report!
2049
placeholder: |
21-
You can include Quarto document code which includes code blocks like this:
50+
You can include Quarto document code which includes code blocks like this:
2251
23-
````qmd
24-
---
25-
title: "Hello Quarto!"
26-
format: html
27-
---
52+
````qmd
53+
---
54+
title: "Hello Quarto!"
55+
format: html
56+
---
2857
29-
```py
30-
print("Hello Quarto!")
31-
```
32-
````
58+
```py
59+
print("Hello Quarto!")
60+
```
61+
````
3362
34-
---
63+
---
3564
36-
### Additional information that can help us to help you
65+
### Additional information that can help us to help you
3766
38-
- What Quarto version are you using?
39-
You can find the version of Quarto you used by running `quarto --version` in your terminal.
40-
- What operating system are you using?
41-
Linux Ubuntu 20.04, macOS 11.2.3, Windows 10, _etc._
67+
- What Quarto version are you using?
68+
You can find the version of Quarto you used by running `quarto --version` in your terminal.
69+
- What operating system are you using?
70+
Linux Ubuntu 20.04, macOS 11.2.3, Windows 10, _etc._
4271
validations:
4372
required: true
4473
- type: markdown

.github/DISCUSSION_TEMPLATE/show-and-tell.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
title: "<The item you want to talk about>"
1+
title: "The item you want to talk about"
22
body:
33
- type: markdown
4-
attributes:
4+
attributes:
55
value: |
66
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).
77
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).
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Documentation issue
2+
description: Report issues on quarto.org, give documentation feedback, or suggest documentation improvements
3+
labels: ["documentation"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Welcome to the quarto GitHub repository!
9+
10+
We are always happy to hear feedback from our users.
11+
12+
When reporting an issue with the documentation, please consider adding a link to the page you are referring to and a screenshot of the issue.
13+
14+
If you want to report a bug, please use the [Bug Reports GitHub Issues](https://github.com/quarto-dev/quarto-cli/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml).
15+
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).
16+
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).
17+
18+
Thank you for using Quarto!
19+
20+
- type: dropdown
21+
id: type-documentation
22+
attributes:
23+
label: What would you like to do?
24+
options:
25+
- Report an issue on quarto.org
26+
- Give feedback or suggest an improvement
27+
default: 0
28+
validations:
29+
required: true
30+
31+
- type: textarea
32+
attributes:
33+
label: Description
34+
description: Describe the issue, give feedback or suggest an improvement.
35+
placeholder: Please describe your issue/feedback/improvement here. For issues on quarto.org, include a link to the page you are referring to and a screenshot of the issue.
36+
37+
- type: markdown
38+
attributes:
39+
value: "_Thanks for submitting this bug report, feedback or improvement suggestion!_"

.github/actions/docker/action.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,15 @@ runs:
3434
3535
- if: ${{ inputs.daily == 'false' }}
3636
shell: bash
37-
run: echo "LATEST_TAG=-t ${{ env.BASE_NM }}:latest" >> $GITHUB_ENV
37+
run: |
38+
echo "LATEST_TAG_BASE=-t ${{ env.BASE_NM }}:latest" >> $GITHUB_ENV
39+
echo "LATEST_TAG_FULL=-t ${{ env.FULL_NM }}:latest" >> $GITHUB_ENV
3840
3941
- if: ${{ inputs.daily == 'true' }}
4042
shell: bash
41-
run: echo "DAILY_TAG=-t ${{ env.BASE_NM }}:daily" >> $GITHUB_ENV
43+
run: |
44+
echo "DAILY_TAG_BASE=-t ${{ env.BASE_NM }}:daily" >> $GITHUB_ENV
45+
echo "DAILY_TAG_FULL=-t ${{ env.FULL_NM }}:daily" >> $GITHUB_ENV
4246
4347
- name: Create Base DockerFile
4448
shell: bash
@@ -53,7 +57,7 @@ runs:
5357
shell: bash
5458
run: |
5559
echo ${{ inputs.token }} | docker login https://ghcr.io -u ${{ inputs.username }} --password-stdin
56-
docker build -t ${{ env.BASE_NM }}:${{ inputs.version }} ${{ env.LATEST_TAG }} ${{ env.DAILY_TAG }} .
60+
docker build -t ${{ env.BASE_NM }}:${{ inputs.version }} ${{ env.LATEST_TAG_BASE }} ${{ env.DAILY_TAG_BASE }} .
5761
docker push ${{ env.BASE_NM }} --all-tags
5862
5963
- name: Create Full DockerFile
@@ -67,11 +71,10 @@ runs:
6771
RUN dpkg -i quarto-linux-amd64.deb && rm quarto-linux-amd64.deb
6872
RUN quarto install tinytex --no-prompt
6973
EOF
70-
74+
7175
- name: Push Full Image
7276
shell: bash
7377
run: |
7478
echo ${{ inputs.token }} | docker login https://ghcr.io -u ${{ inputs.username }} --password-stdin
75-
docker build -t ${{ env.FULL_NM }}:${{ inputs.version }} ${{ env.LATEST_TAG }} ${{ env.DAILY_TAG }} .
79+
docker build -t ${{ env.FULL_NM }}:${{ inputs.version }} ${{ env.LATEST_TAG_FULL }} ${{ env.DAILY_TAG_FULL }} .
7680
docker push ${{ env.FULL_NM }} --all-tags
77-

.github/workflows/actions/launcher/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: 'Builds the Quarto Launcher'
77
runs:
88
using: "composite"
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v4
1111
uses: actions-rs/toolchain@v1
1212
with:
1313
toolchain: 1.63.0

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,19 @@ runs:
3434
- name: Basic dev mode sanity check
3535
shell: pwsh
3636
run: |
37-
If ( "$(quarto --version)" -ne "99.9.9") { Exit 1 }
38-
If ( $(quarto --paths | Select-String -Pattern "package[/\\]+dist[/\\]+share") -ne $null ) { Exit 1 }
39-
If ( "$(git status --porcelain)" -ne "" ) { Exit 1 }
37+
If ( "$(quarto --version)" -ne "99.9.9") {
38+
echo "Unexpected version detected: $(quarto --version)"
39+
Exit 1
40+
}
41+
If ( $(quarto --paths | Select-String -Pattern "package[/\\]+dist[/\\]+share") -ne $null ) {
42+
echo "Unexpected package/dist/share path detected: $(quarto --paths)"
43+
Exit 1
44+
}
45+
If ( "$(git status --porcelain)" -ne "" ) {
46+
echo "Uncommitted changes detected:"
47+
git status --porcelain
48+
Exit 1
49+
}
4050
4151
- name: Quarto Check
4252
if: runner.debug == '1'

0 commit comments

Comments
 (0)