merge

Author: cscheid

.github/CODE_OF_CONDUCT.md

@@ -36,7 +36,9 @@ Examples of unacceptable behavior include:
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 * Providing bad information by copying output from AI assistants
-  without verifying its validity
+  without verifying its validity. This _specifically_ includes autonomous agents
+  from OpenClaw, etc. We consider these account-bannable on first offense.
+  You have been warned.
 
 ## Enforcement Responsibilities
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -13,7 +13,7 @@ body:
 
         - 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
         - If you're reporting an issue inside **RStudio**, please visit https://github.com/rstudio/rstudio
-        - If you're reporting an issue inside **Positron**, please visit https://github.com/posit-dev/positron
+        - If you're reporting an issue inside **Positron**, please visit https://github.com/posit-dev/positron/discussions
         - 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).
         - 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).
 

.github/ISSUE_TEMPLATE/documentation.yml

@@ -29,6 +29,7 @@ body:
       required: true
 
   - type: textarea
+    id: description
     attributes:
       label: Description
       description: Describe the issue, give feedback or suggest an improvement.

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

@@ -12,6 +12,17 @@ runs:
         restore-keys: |
           ${{ runner.os }}-deno_std-2-
 
+    - name: Cache Cargo dependencies
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          package/typst-gather/target
+        key: ${{ runner.os }}-cargo-typst-gather-${{ hashFiles('package/typst-gather/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-cargo-typst-gather-
+
     - name: Configure Quarto (.sh)
       if: runner.os != 'Windows'
       shell: bash
@@ -33,13 +44,13 @@ runs:
     - name: Basic dev mode sanity check
       shell: pwsh
       run: |
-        If ( "$(quarto --version)" -ne "99.9.9") { 
+        If ( "$(quarto --version)" -ne "99.9.9") {
           echo "Unexpected version detected: $(quarto --version)"
-          Exit 1 
+          Exit 1
         }
-        If ( $(quarto --paths | Select-String -Pattern "package[/\\]+dist[/\\]+share") -ne $null ) { 
+        If ( $(quarto --paths | Select-String -Pattern "package[/\\]+dist[/\\]+share") -ne $null ) {
           echo "Unexpected package/dist/share path detected: $(quarto --paths)"
-          Exit 1 
+          Exit 1
         }
         # check if configure is modifying some files as it should not
         $modifiedFiles = git diff --name-only

.github/workflows/cleanup-caches.yml

@@ -0,0 +1,63 @@
+name: Cleanup github runner caches on closed pull requests
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - name: Cleanup
+        run: |
+          echo "::group::Fetching cache list for PR #${{ github.event.pull_request.number }}"
+          echo "Branch ref: $BRANCH"
+
+          # Get full cache list with details for logging
+          cacheList=$(gh cache list --ref $BRANCH --limit 100 --json id,key,sizeInBytes)
+          cacheCount=$(echo "$cacheList" | jq '. | length')
+
+          echo "Found $cacheCount cache(s) for this PR"
+
+          if [ "$cacheCount" -gt 0 ]; then
+            echo "Cache details:"
+            echo "$cacheList" | jq -r '.[] | "  - ID: \(.id) | Key: \(.key) | Size: \(.sizeInBytes | tonumber / 1024 / 1024 | floor)MB"'
+          fi
+          echo "::endgroup::"
+
+          if [ "$cacheCount" -eq 0 ]; then
+            echo "No caches to delete"
+            exit 0
+          fi
+
+          # Extract just the IDs for deletion
+          cacheKeysForPR=$(echo "$cacheList" | jq -r '.[].id')
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+
+          echo "::group::Deleting caches"
+          deleted=0
+          failed=0
+
+          for cacheKey in $cacheKeysForPR
+          do
+              echo "Deleting cache ID: $cacheKey"
+              if gh cache delete $cacheKey; then
+                echo "  ✓ Successfully deleted cache $cacheKey"
+                ((deleted++))
+              else
+                echo "  ✗ Failed to delete cache $cacheKey"
+                ((failed++))
+              fi
+          done
+
+          echo "::endgroup::"
+
+          echo "::notice::Cache cleanup complete: $deleted deleted, $failed failed out of $cacheCount total"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
+          BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge

.github/workflows/create-release.yml

@@ -15,6 +15,9 @@ on:
         type: boolean
         default: true
 
+env:
+  NFPM_VERSION: "2.43.1"
+
 concurrency:
   # make publishing release concurrent (but others trigger not)
   group: building-releases-${{ inputs.publish-release && 'prerelease' || github.run_id }}
@@ -194,6 +197,8 @@ jobs:
 
   make-tarball-rhel:
     runs-on: ubuntu-latest
+    # temporarily disable due to unavailability of latest deno in conda-forge
+    if: false
     needs: [configure]
     steps:
       - uses: actions/checkout@v4
@@ -240,9 +245,13 @@ jobs:
           name: RHEL Zip
           path: ./package/quarto-${{needs.configure.outputs.version}}-linux-rhel7-amd64.tar.gz
 
-  make-installer-arm64-deb:
+  make-installer-linux:
     runs-on: ubuntu-latest
     needs: [configure]
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+        format: [deb, rpm]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -256,57 +265,47 @@ jobs:
         run: |
           ./configure.sh
 
-      - name: Prepare Distribution
-        run: |
-          pushd package/src/
-          ./quarto-bld prepare-dist --set-version ${{needs.configure.outputs.version}} --arch aarch64 --log-level info
-          popd
-
-      - name: Make Installer
-        run: |
-          pushd package/src/
-          ./quarto-bld make-installer-deb --set-version ${{needs.configure.outputs.version}} --arch aarch64 --log-level info
-          popd
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: Deb Arm64 Installer
-          path: ./package/out/quarto-${{needs.configure.outputs.version}}-linux-arm64.deb
-
-  make-installer-deb:
-    runs-on: ubuntu-latest
-    needs: [configure]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ needs.configure.outputs.version_commit }}
-
-      - name: Prevent Re-run
-        if: ${{ inputs.publish-release }}
-        uses: ./.github/workflows/actions/prevent-rerun
-
-      - name: Configure
+      - name: Install nfpm
         run: |
-          ./configure.sh
+          wget -q https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm_${NFPM_VERSION}_Linux_x86_64.tar.gz
+          tar -xzf nfpm_${NFPM_VERSION}_Linux_x86_64.tar.gz
+          sudo mv nfpm /usr/local/bin/
+          nfpm --version
 
       - name: Prepare Distribution
         run: |
           pushd package/src/
-          ./quarto-bld prepare-dist --set-version ${{needs.configure.outputs.version}} --log-level info
+          ./quarto-bld prepare-dist --set-version ${{needs.configure.outputs.version}} ${{ matrix.arch == 'aarch64' && '--arch aarch64' || '' }} --log-level info
           popd
 
       - name: Make Installer
         run: |
           pushd package/src/
-          ./quarto-bld make-installer-deb --set-version ${{needs.configure.outputs.version}} --log-level info
+          ./quarto-bld make-installer-${{ matrix.format }} --set-version ${{needs.configure.outputs.version}} ${{ matrix.arch == 'aarch64' && '--arch aarch64' || '' }} --log-level info
           popd
 
+      - name: Set package architecture name
+        id: pkg_arch
+        run: |
+          if [ "${{ matrix.format }}" == "deb" ]; then
+            if [ "${{ matrix.arch }}" == "x86_64" ]; then
+              echo "arch_name=amd64" >> $GITHUB_OUTPUT
+            else
+              echo "arch_name=arm64" >> $GITHUB_OUTPUT
+            fi
+          else
+            if [ "${{ matrix.arch }}" == "x86_64" ]; then
+              echo "arch_name=x86_64" >> $GITHUB_OUTPUT
+            else
+              echo "arch_name=aarch64" >> $GITHUB_OUTPUT
+            fi
+          fi
+
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: Deb Installer
-          path: ./package/out/quarto-${{needs.configure.outputs.version}}-linux-amd64.deb
+          name: Linux-${{ matrix.format }}-${{ matrix.arch }}-Installer
+          path: ./package/out/quarto-${{needs.configure.outputs.version}}-linux-${{ steps.pkg_arch.outputs.arch_name }}.${{ matrix.format }}
 
   test-tarball-linux:
     runs-on: ubuntu-latest
@@ -361,10 +360,6 @@ jobs:
         if: ${{ inputs.publish-release }}
         uses: ./.github/workflows/actions/prevent-rerun
 
-      - name: Configure Rust Tools
-        run: |
-          rustup.exe toolchain install 1.63.0 --component rustfmt --component clippy --no-self-update
-          rustup.exe default 1.63.0
       - name: Configure
         run: |
           .\configure.cmd
@@ -390,6 +385,7 @@ jobs:
             ./package/pkg-working/bin/tools/x86_64/esbuild.exe
             ./package/pkg-working/bin/tools/x86_64/dart-sass/src/dart.exe
             ./package/pkg-working/bin/tools/x86_64/deno_dom/plugin.dll
+            ./package/pkg-working/bin/tools/x86_64/typst-gather.exe
             ./package/pkg-working/bin/tools/pandoc.exe
             ./package/pkg-working/bin/quarto.js
         env:
@@ -593,8 +589,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [
         configure,
-        make-installer-deb,
-        make-installer-arm64-deb,
+        make-installer-linux,
         make-installer-win,
         make-installer-mac,
         # optional in release to not be blocked by RHEL build depending on conda-forge deno dependency
@@ -660,13 +655,21 @@ jobs:
           sha256sum quarto-${{needs.configure.outputs.version}}-linux-arm64.tar.gz >> ../quarto-${{needs.configure.outputs.version}}-checksums.txt
           popd
 
-          pushd Deb\ Installer
+          pushd Linux-deb-x86_64-Installer
           sha256sum quarto-${{needs.configure.outputs.version}}-linux-amd64.deb >> ../quarto-${{needs.configure.outputs.version}}-checksums.txt
           popd
 
-          pushd Deb\ Arm64\ Installer
+          pushd Linux-deb-aarch64-Installer
           sha256sum quarto-${{needs.configure.outputs.version}}-linux-arm64.deb >> ../quarto-${{needs.configure.outputs.version}}-checksums.txt
-          popd          
+          popd
+
+          pushd Linux-rpm-x86_64-Installer
+          sha256sum quarto-${{needs.configure.outputs.version}}-linux-x86_64.rpm >> ../quarto-${{needs.configure.outputs.version}}-checksums.txt
+          popd
+
+          pushd Linux-rpm-aarch64-Installer
+          sha256sum quarto-${{needs.configure.outputs.version}}-linux-aarch64.rpm >> ../quarto-${{needs.configure.outputs.version}}-checksums.txt
+          popd
 
           pushd Source
           sha256sum quarto-${{needs.configure.outputs.version}}.tar.gz >> ../quarto-${{needs.configure.outputs.version}}-checksums.txt
@@ -690,8 +693,10 @@ jobs:
             ./Deb Zip/quarto-${{needs.configure.outputs.version}}-linux-amd64.tar.gz
             ./Deb Arm64 Zip/quarto-${{needs.configure.outputs.version}}-linux-arm64.tar.gz
             ./RHEL Zip/quarto-${{needs.configure.outputs.version}}-linux-rhel7-amd64.tar.gz
-            ./Deb Installer/quarto-${{needs.configure.outputs.version}}-linux-amd64.deb
-            ./Deb Arm64 Installer/quarto-${{needs.configure.outputs.version}}-linux-arm64.deb
+            ./Linux-deb-x86_64-Installer/quarto-${{needs.configure.outputs.version}}-linux-amd64.deb
+            ./Linux-deb-aarch64-Installer/quarto-${{needs.configure.outputs.version}}-linux-arm64.deb
+            ./Linux-rpm-x86_64-Installer/quarto-${{needs.configure.outputs.version}}-linux-x86_64.rpm
+            ./Linux-rpm-aarch64-Installer/quarto-${{needs.configure.outputs.version}}-linux-aarch64.rpm
             ./Windows Installer/quarto-${{needs.configure.outputs.version}}-win.msi
             ./Windows Zip/quarto-${{needs.configure.outputs.version}}-win.zip
             ./Mac Installer/quarto-${{needs.configure.outputs.version}}-macos.pkg
@@ -703,8 +708,7 @@ jobs:
     if: ${{ (failure() || cancelled()) && inputs.publish-release }}
     needs: [
         configure,
-        make-installer-deb,
-        make-installer-arm64-deb,
+        make-installer-linux,
         make-installer-win,
         make-installer-mac,
         # optional in release to not be blocked by RHEL build depending on conda-forge deno dependency
@@ -761,10 +765,20 @@ jobs:
 
       - uses: ./.github/actions/docker
         with:
-          source: ./Deb Installer/quarto-${{needs.configure.outputs.version}}-linux-amd64.deb
+          source: ./Linux-deb-x86_64-Installer/quarto-${{needs.configure.outputs.version}}-linux-amd64.deb
           version: ${{needs.configure.outputs.version}}
           token: ${{ secrets.GITHUB_TOKEN }}
           username: ${{ github.actor }}
           org: ${{ github.repository_owner }}
           name: quarto
           daily: ${{ inputs.pre-release }}
+
+  call-cloudsmith-publish:
+    if: ${{ inputs.publish-release && ! (inputs.pre-release == true) }}
+    needs: [configure, publish-release]
+    uses: ./.github/workflows/publish-cloudsmith.yml
+    with:
+      version: ${{ needs.configure.outputs.tag_name }}
+      dry-run: false
+    secrets:
+      CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}

.github/workflows/performance-check.yml

@@ -38,7 +38,7 @@ jobs:
           pushd package/src
 
           bundle_start=$(date +%s.%3N)
-          ./quarto-bld prepare-dist
+          ./quarto-bld prepare-dist --set-version $(cat ../../version.txt)
           bundle_end=$(date +%s.%3N)
           bundle_elapsed=$(printf '%.3f\n' $(echo "scale=3; $bundle_end - $bundle_start" | bc))