.github/workflows/action_tests.yaml

@@ -419,6 +419,49 @@ jobs:
           npm install
           ./action_tests/assert.js all-hold-the-line-no-upload-id
 
+  pull_request_expect_trunk_check_timeout:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          path: local-action
+
+      - name: Set up test
+        shell: bash
+        run: |
+          ./local-action/action_tests/setup.sh src-repo repo-under-test
+          cd repo-under-test
+          git checkout feature-branch
+          echo "EXPECTED_UPSTREAM=$(git rev-parse feature-branch^1)" >>$GITHUB_ENV
+
+      - name: Run trunk-action
+        shell: bash
+        id: trunk-action
+        run: |
+          cd repo-under-test
+          git checkout feature-branch
+          ../local-action/pull_request.sh
+        env:
+          INPUT_ARGUMENTS: ""
+          INPUT_CHECK_RUN_ID: 12345678
+          INPUT_DEBUG: ""
+          INPUT_LABEL: ""
+          TRUNK_PATH: ../local-action/action_tests/stub.js
+          INPUT_GITHUB_REF_NAME: feature-branch
+          GITHUB_EVENT_PULL_REQUEST_NUMBER: ""
+          GITHUB_EVENT_PULL_REQUEST_BASE_SHA: ${{ env.EXPECTED_UPSTREAM }}
+          GITHUB_EVENT_PULL_REQUEST_HEAD_SHA: ""
+          GITHUB_EVENT_PULL_REQUEST_HEAD_REPO_FORK: ""
+          INPUT_SAVE_ANNOTATIONS: ""
+          INPUT_AUTOFIX_AND_PUSH: true
+          INPUT_TIMEOUT_SECONDS: 1
+
+      - name: Assert trunk-action check has failed
+        shell: bash
+        if: steps.trunk-action.outcome == 'success'
+        run: exit 1
+
   pull_request_autofix:
     runs-on: ubuntu-latest
     steps:

.github/workflows/repo_tests.yaml

@@ -35,7 +35,8 @@ jobs:
             description: (compile-commands.json)
             post-init: |
               # black complains about py2 code
-              ${TRUNK_PATH} check disable black
+              # markdownlint fails for some reason, and what we really care about anyways is clang-tidy
+              ${TRUNK_PATH} check disable black markdownlint
               mkdir build
               cd build
               cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
@@ -44,8 +45,6 @@ jobs:
               sed -i "s|lint:|lint:\n  compile_commands: json|" .trunk/trunk.yaml
               cp local-action/repo_tests/yaml_cpp.yaml .trunk/user.yaml
               ${TRUNK_PATH} check enable clang-tidy
-              # markdownlint fails for some reason, and what we really care about anyways is clang-tidy
-              ${TRUNK_PATH} check disable markdownlint
 
           - repo: pallets/flask
             ref: 4bcd4be6b7d69521115ef695a379361732bcaea6
@@ -75,6 +74,23 @@ jobs:
               fi
             description: (test for setup-node)
 
+          - repo: prawn-test-staging-rw/node-packages-failure-test
+            ref: main
+            post-init: |
+              if [ "${FAILED_NODE_PACKAGE_INSTALL}" != "true" ]; then
+                echo "::error::Node package install didn't fail"
+                exit 1
+              fi
+              if grep -q "✔ eslint" <(${TRUNK_PATH} check list --color=false); then
+                echo "::error::eslint not disabled"
+                exit 1
+              fi
+              if grep -q "✔ stylelint" <(${TRUNK_PATH} check list --color=false); then
+                echo "::error::stylelint not disabled"
+                exit 1
+              fi
+            description: (test for continuing on node package install failure)
+
           - repo: replayio/devtools
             ref: 730a9f0ddaafefc2a1a293d6924ce3910cd156ac
             description: (has trunk.yaml)
@@ -95,10 +111,7 @@ jobs:
             description: (has trunk.yaml)
             post-init: |
               # all of these linters have failures
-              ${TRUNK_PATH} check disable svgo
-              ${TRUNK_PATH} check disable golangci-lint
-              ${TRUNK_PATH} check disable prettier
-              ${TRUNK_PATH} check disable oxipng
+              ${TRUNK_PATH} check disable svgo golangci-lint prettier oxipng
 
           - repo: shopify/draggable
             ref: e6cf325a98c11b8aefbfb626b7a91b95d1c340c9

.github/workflows/weekly.yaml

@@ -26,6 +26,7 @@ jobs:
           private_key: ${{ secrets.TRUNK_OPEN_PR_APP_PRIVATE_KEY }}
 
       - name: Trunk Upgrade
+        id: upgrade
         uses: ./upgrade # external users: use trunk-io/trunk-action/upgrade@v1
         with:
           github-token: ${{ steps.generate-token.outputs.token }}

.trunk/trunk.yaml

@@ -1,15 +1,15 @@
 version: 0.1
 
 cli:
-  version: 1.19.0
+  version: 1.22.2
 
 plugins:
   sources:
     - id: trunk
-      ref: v1.4.2
+      ref: v1.6.0
       uri: https://github.com/trunk-io/plugins
     - id: configs
-      ref: v1.0.1
+      ref: v1.0.5
       uri: https://github.com/trunk-io/configs
 
 lint:

action.yaml

@@ -102,6 +102,18 @@ inputs:
     required: false
     default: "false"
 
+  timeout-seconds:
+    description:
+      Timeout seconds before we kill the long running trunk check process via unix timeout command.
+      Default setting of 0 seconds disables the timeout.
+    required: false
+    default: 0
+
+  cat-trunk-debug-logs:
+    description: Option to cat .trunk/logs/cli.log && .trunk/logs/daemon.log
+    required: false
+    default: false
+
 runs:
   using: composite
   steps:
@@ -179,6 +191,7 @@ runs:
         INPUT_CACHE=${{ inputs.cache }}
         INPUT_CACHE_KEY=trunk-${{ inputs.cache-key }}-${{ runner.os }}-${{ hashFiles('.trunk/trunk.yaml') }}
         INPUT_CACHE_PATH=~/.cache/trunk
+        INPUT_CAT_TRUNK_DEBUG_LOGS=${{ inputs.cat-trunk-debug-logs }}
         INPUT_CHECK_ALL_MODE=${{ inputs.check-all-mode }}
         INPUT_CHECK_MODE=${{ inputs.check-mode }}
         INPUT_CHECK_RUN_ID=${{ inputs.check-run-id }}
@@ -189,6 +202,7 @@ runs:
         INPUT_SETUP_DEPS=${{ inputs.setup-deps }}
         INPUT_TARGET_CHECKOUT=
         INPUT_TARGET_CHECKOUT_REF=
+        INPUT_TIMEOUT_SECONDS=${{ inputs.timeout-seconds }}
         INPUT_TRUNK_PATH=${{ inputs.trunk-path }}
         INPUT_UPLOAD_LANDING_STATE=false
         INPUT_UPLOAD_SERIES=${{ inputs.upload-series }}
@@ -210,7 +224,7 @@ runs:
 
     - name: Locate trunk
       shell: bash
-      run: ${GITHUB_ACTION_PATH}/locate_trunk.sh
+      run: ${GITHUB_ACTION_PATH}/setup/locate_trunk.sh
 
     - name: Determine check mode
       shell: bash
@@ -223,6 +237,7 @@ runs:
       run: |
         if [ ! -e .trunk/trunk.yaml ]; then
           ${TRUNK_PATH:-trunk} init
+          echo "INITIALIZED_TRUNK=true" >>$GITHUB_ENV
         fi
 
     - name: Detect setup strategy
@@ -259,7 +274,11 @@ runs:
       shell: bash
       run: |
         # Run 'trunk check' on pull request
-        ${GITHUB_ACTION_PATH}/pull_request.sh
+        if [[ "${{ inputs.timeout-seconds }}" != "0" ]]; then
+          timeout ${{ inputs.timeout-seconds }} ${GITHUB_ACTION_PATH}/pull_request.sh
+        else
+          ${GITHUB_ACTION_PATH}/pull_request.sh
+        fi
       env:
         INPUT_SAVE_ANNOTATIONS: ${{ inputs.save-annotations }}
 
@@ -268,7 +287,11 @@ runs:
       shell: bash
       run: |
         # Run 'trunk check' on push
-        ${GITHUB_ACTION_PATH}/push.sh
+        if [[ "${{ inputs.timeout-seconds }}" != "0" ]]; then
+          timeout ${{ inputs.timeout-seconds }} ${GITHUB_ACTION_PATH}/push.sh
+        else
+          ${GITHUB_ACTION_PATH}/push.sh
+        fi
       env:
         GITHUB_EVENT_AFTER: ${{ env.GITHUB_EVENT_AFTER || github.event.after }}
         GITHUB_EVENT_BEFORE: ${{ env.GITHUB_EVENT_BEFORE || github.event.before }}
@@ -278,14 +301,42 @@ runs:
       shell: bash
       run: |
         # Run 'trunk check' on all
-        ${GITHUB_ACTION_PATH}/all.sh
+        if [[ "${{ inputs.timeout-seconds }}" != "0" ]]; then
+          timeout ${{ inputs.timeout-seconds }} ${GITHUB_ACTION_PATH}/all.sh
+        else
+          ${GITHUB_ACTION_PATH}/all.sh
+        fi
 
     - name: Run trunk check on Trunk Merge
       if: env.TRUNK_CHECK_MODE == 'trunk_merge'
       shell: bash
       run: |
         # Run 'trunk check' on Trunk Merge
-        ${GITHUB_ACTION_PATH}/trunk_merge.sh
+        if [[ "${{ inputs.timeout-seconds }}" != "0" ]]; then
+          timeout ${{ inputs.timeout-seconds }} ${GITHUB_ACTION_PATH}/trunk_merge.sh
+        else
+          ${GITHUB_ACTION_PATH}/trunk_merge.sh
+        fi
+
+    - name: Cat Trunk Cli / Daemon logs
+      if: always() && inputs.cat-trunk-debug-logs == 'true'
+      shell: bash
+      run: |
+        echo "::group::.trunk/logs/cli.log"
+        if [ -f .trunk/logs/cli.log ]; then
+          cat .trunk/logs/cli.log
+        else
+          echo ".trunk/logs/cli.log doesn't exist"
+        fi
+        echo "::endgroup::"
+
+        echo "::group::.trunk/logs/daemon.log"
+        if [ -f .trunk/logs/daemon.log ]; then
+          cat .trunk/logs/daemon.log
+        else
+          echo ".trunk/logs/daemon.log doesn't exist"
+        fi
+        echo "::endgroup::"
 
     - name: Run trunk install to populate the GitHub Actions cache
       if: env.TRUNK_CHECK_MODE == 'populate_cache_only'

install/action.yaml

@@ -0,0 +1,35 @@
+name: Trunk Check
+author: trunk.io
+description: Install trunk and managed tools to PATH
+
+inputs:
+  tools:
+    description: specific tools to install (if not specified will install all enabled tools)
+    required: false
+
+branding:
+  icon: check
+  color: green
+
+runs:
+  using: composite
+  steps:
+    - name: get trunk
+      shell: bash
+      run: ${GITHUB_ACTION_PATH}/get_trunk.sh
+
+    - name: clean up possible dead symlink
+      shell: bash
+      run: |
+        tools_path=".trunk/tools"
+        if [ -L "${tools_path}" ] && [ ! -e "${tools_path}" ] ; then
+          rm "${tools_path}"
+        fi
+
+    - name: Trunk install
+      shell: bash
+      run: trunk tools install --ci ${{ inputs.tools }}
+
+    - name: Add .trunk/tools to path
+      shell: bash
+      run: echo ".trunk/tools" >> $GITHUB_PATH

install/get_trunk.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -euo pipefail
+
+if [[ ${INPUT_DEBUG:-false} == "true" ]]; then
+  set -x
+fi
+
+tmpdir="$(mktemp -d)"
+echo "TRUNK_TMPDIR=${tmpdir}" >>"${GITHUB_ENV}"
+
+curl -fsSL https://trunk.io/releases/trunk -o "${tmpdir}/trunk"
+chmod u+x "${tmpdir}/trunk"
+trunk_path="${tmpdir}/trunk"
+
+echo "TRUNK_PATH=${trunk_path}" >>"${GITHUB_ENV}"
+echo "${tmpdir}" >>"${GITHUB_PATH}"
+
+# Ensure that trunk CLI is downloaded before subsequent steps (swallow output of version command)
+(${trunk_path} version >/dev/null 2>&1) || echo "::warning::${trunk_path} does not exist!"

readme.md

@@ -321,6 +321,23 @@ requests". If you have checks that run on pull requests, you will need to supply
 the upgrade action to run those checks. For more information, see
 [create-pull-request](https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#triggering-further-workflow-runs).
 
+## Automatic trunk setup
+
+To install trunk on your CI machine
+
+```yaml
+jobs:
+  trunk_install:
+    name: Install trunk
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      # >>> After this step, trunk is available as the env var TRUNK_PATH <<<
+      - name: Trunk install
+        uses: trunk-io/trunk-action/setup@v1
+```
+
 ## Feedback
 
 Join the [Trunk Community Slack][slack]. ❤️

setup-env/action.yaml

@@ -71,11 +71,23 @@ runs:
           echo "Could not find existing node install, skipping node package installation"
         fi
 
+    - name: Determine pnpm version
+      if: env.PACKAGE_MANAGER == 'pnpm'
+      shell: bash
+      run: |
+        if [ -e package.json ] && command -v jq >/dev/null; then
+          PNPM_VERSION=$(jq -r '.packageManager|split("@")[1]' package.json || echo "")
+        fi
+        if [ -z "${PNPM_VERSION}" ]; then
+          PNPM_VERSION=latest
+        fi
+        echo "PNPM_VERSION=${PNPM_VERSION}" >>$GITHUB_ENV
+
     - name: Install pnpm
       if: env.PACKAGE_MANAGER == 'pnpm'
       uses: pnpm/action-setup@v2
       with:
-        version: latest
+        version: ${{ env.PNPM_VERSION }}
 
     - name: Install Node dependencies
       id: setup_node
@@ -115,6 +127,26 @@ runs:
           hashFiles(env.HASH_GLOB) }}
 
     - name: Install ${{ env.PACKAGE_MANAGER }} packages
+      id: install_packages
       if: env.PACKAGE_MANAGER && (env.NODE_VERSION_FILE || env.RUN_INSTALL_NODE_PACKAGES)
       shell: bash
       run: ${{ env.INSTALL_CMD }}
+      continue-on-error: true
+
+    - name: Check for package install
+      if: env.PACKAGE_MANAGER && (env.NODE_VERSION_FILE || env.RUN_INSTALL_NODE_PACKAGES)
+      shell: bash
+      run: |
+        if [ ${{ steps.install_packages.outcome }} == "success" ]; then
+          exit 0
+        fi
+        echo "FAILED_NODE_PACKAGE_INSTALL=true" >>$GITHUB_ENV
+
+        if [[ -z "${INITIALIZED_TRUNK}" ]]; then
+          echo "::error::Failed to install node packages."
+          echo "::error::Aborting because this repo has an existing trunk.yaml file."
+          exit 1
+        fi
+        echo "::warning::Failed to install node packages."
+        echo "::warning::Disabling linters that depend on node packages."
+        ${TRUNK_PATH} check disable eslint stylelint