Merge branch 'main' into post-render/logging

Author: cderv

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# This file lists revisions of large-scale formatting/style changes so that
+# they can be excluded from git blame results.
+#
+# To set this file as the default ignore file for git blame, run:
+#   $ git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Run air formatter on project
+809462301b7e19d95dcf160ae9a85e1fe2c49b0d

.github/workflows/actions/prevent-rerun/action.yml

@@ -0,0 +1,11 @@
+name: Prevent Workflow Re-run
+description: Fails if the workflow is re-run (github.run_attempt > 1)
+runs:
+  using: "composite"
+  steps:
+    - name: Prevent any re-run
+      if: ${{ github.run_attempt > 1 }}
+      run: |
+        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'"
+        exit 1
+      shell: bash

.github/workflows/create-release.yml

@@ -28,13 +28,18 @@ jobs:
       tag_name: v${{ steps.read-version.outputs.version_full }}
       version_commit: ${{ steps.version_commit.outputs.commit_long_sha }}
       pushed: ${{ steps.version_commit.outputs.pushed }}
+      tagged: ${{ steps.version_commit.outputs.tagged }}
       tag_pushed: ${{ steps.version_commit.outputs.tag_pushed }}
     if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'quarto-dev/quarto-cli')
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       # we _also_ need npm, specifically for webui/preview
       - uses: actions/setup-node@v4
         with:
@@ -99,6 +104,10 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Make Tarball
         run: |
           tar --owner=root --group=root -zcvf  quarto-${{needs.configure.outputs.version}}.tar.gz *
@@ -117,6 +126,10 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -150,6 +163,10 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -183,6 +200,10 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -227,6 +248,10 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -257,6 +282,10 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -283,13 +312,34 @@ jobs:
     runs-on: ubuntu-latest
     needs: [configure, make-tarball]
     steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.configure.outputs.version_commit }}
+          sparse-checkout: |
+            .github
+
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - uses: actions/download-artifact@v4
         with:
           name: Deb Zip
           path: .
       - run: |
           tar -zxf quarto-${{needs.configure.outputs.version}}-linux-amd64.tar.gz
           echo "$GITHUB_WORKSPACE/quarto-${{needs.configure.outputs.version}}/bin" >> $GITHUB_PATH
+
+      # Check for share/preview/quarto-preview.js
+      - name: Ensure share/preview/quarto-preview.js exists
+        shell: bash
+        run: |
+          if [ ! -f "share/preview/quarto-preview.js" ]; then
+            echo "::error file=share/preview/quarto-preview.js::Required file share/preview/quarto-preview.js not found. Check the linux build Prepare Distribution step."
+            exit 1
+          fi
+        working-directory: ${{ github.workspace }}/quarto-${{needs.configure.outputs.version}}
+
       - run: |
           tar -tzvf quarto-${{needs.configure.outputs.version}}-linux-amd64.tar.gz | head
           ls -lR
@@ -303,15 +353,18 @@ jobs:
     needs: [configure]
 
     steps:
-      - 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
-
       - 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 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
@@ -383,14 +436,46 @@ jobs:
     runs-on: windows-latest
     needs: [configure, make-installer-win]
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.configure.outputs.version_commit }}
+          sparse-checkout: |
+            .github
+
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
+      - name: "Download Windows Zip"
+        uses: actions/download-artifact@v4
         with:
           name: Windows Zip
           path: .
-      - run: |
+
+      - name: "Extract Windows Zip"
+        run: |
           tar -xf quarto-${{needs.configure.outputs.version}}-win.zip
-      - run: Add-Content $env:GITHUB_PATH "$env:GITHUB_WORKSPACE\bin"
-      - run: |
+
+      # Check for share/preview/quarto-preview.js
+      - name: Ensure share/preview/quarto-preview.js exists
+        shell: bash
+        run: |
+          if [ ! -f "share/preview/quarto-preview.js" ]; then
+            echo "::error file=share/preview/quarto-preview.js::Required file share/preview/quarto-preview.js not found. Check the windows build Prepare Distribution step."
+            exit 1
+          fi
+
+      - name: "Add bin to PATH"
+        run: Add-Content $env:GITHUB_PATH "$env:GITHUB_WORKSPACE\bin"
+
+      - name: "Show Directory Listing and PATH"
+        run: |
+          ls -lR
+          echo $PATH
+        shell: bash
+
+      - name: "Run Quarto Commands"
+        run: |
           quarto check
           quarto --paths
           quarto --version
@@ -403,6 +488,10 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -464,13 +553,33 @@ jobs:
     runs-on: macos-latest
     needs: [configure, make-installer-mac]
     steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.configure.outputs.version_commit }}
+          sparse-checkout: |
+            .github
+
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - uses: actions/download-artifact@v4
         with:
           name: Mac Zip
           path: .
       - run: |
           tar -zxf quarto-${{needs.configure.outputs.version}}-macos.tar.gz
           echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
+
+      # Check for share/preview/quarto-preview.js
+      - name: Ensure share/preview/quarto-preview.js exists
+        shell: bash
+        run: |
+          if [ ! -f "share/preview/quarto-preview.js" ]; then
+            echo "::error file=share/preview/quarto-preview.js::Required file share/preview/quarto-preview.js not found. Check the windows build configure step."
+            exit 1
+          fi
+
       - run: tar -tzvf quarto-${{needs.configure.outputs.version}}-macos.tar.gz | head
       - run: ls -lR
       - run: echo $PATH
@@ -499,6 +608,17 @@ jobs:
       ]
 
     steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.configure.outputs.version_commit }}
+          path: quarto-cli
+          sparse-checkout: |
+            .github
+
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./quarto-cli/.github/workflows/actions/prevent-rerun
+
       - name: Download Artifacts
         uses: actions/download-artifact@v4
 
@@ -601,6 +721,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Revert commit of version.txt
         if: ${{ needs.configure.outputs.pushed }}
         run: |
@@ -614,7 +738,7 @@ jobs:
           git push origin $GITHUB_REF_NAME
 
       - name: Deleted created tag
-        if: ${{ needs.configure.outputs.tag_pushed }}
+        if: ${{ needs.configure.outputs.tagged && needs.configure.outputs.tag_pushed }}
         run: |
           git push --delete origin ${{ needs.configure.outputs.tag_name }}
 
@@ -623,10 +747,19 @@ jobs:
     runs-on: ubuntu-latest
     needs: [configure, publish-release]
     steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            .github
+
+      - name: Prevent Re-run
+        if: ${{ inputs.publish-release }}
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Download Artifacts
         uses: actions/download-artifact@v4
 
-      - uses: quarto-dev/quarto-cli/.github/actions/docker@main
+      - uses: ./.github/actions/docker
         with:
           source: ./Deb Installer/quarto-${{needs.configure.outputs.version}}-linux-amd64.deb
           version: ${{needs.configure.outputs.version}}