From 6df1f9a07d088fbdfd5241e3cef7056dd6dec650 Mon Sep 17 00:00:00 2001 From: Tyler Jang Date: Thu, 7 Dec 2023 15:21:54 -0800 Subject: [PATCH 1/4] Revert "Fix CIDebugger invocation (#581)" This reverts commit 20860ab9e75bfa0617a7764b673d108f08e5edb1. --- .github/actions/linter_tests/action.yaml | 1 - .github/actions/tool_tests/action.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/actions/linter_tests/action.yaml b/.github/actions/linter_tests/action.yaml index 05a3aeafb..bb976fb92 100644 --- a/.github/actions/linter_tests/action.yaml +++ b/.github/actions/linter_tests/action.yaml @@ -86,7 +86,6 @@ runs: shell: bash working-directory: ${{ inputs.path }} trunk-token: ${{ inputs.trunk-token }} - trunk-version: 1.18.0 org: trunk-staging-org run: npm test ${{ inputs.append-args }} ${{ env.PLATFORM_APPEND_ARGS }} --ci env: diff --git a/.github/actions/tool_tests/action.yaml b/.github/actions/tool_tests/action.yaml index 2481e5b16..938952395 100644 --- a/.github/actions/tool_tests/action.yaml +++ b/.github/actions/tool_tests/action.yaml @@ -66,7 +66,6 @@ runs: shell: bash working-directory: ${{ inputs.path }} trunk-token: ${{ inputs.trunk-token }} - trunk-version: 1.18.0 org: trunk-staging-org run: npm test ${{ inputs.append-args }} ${{ env.PLATFORM_APPEND_ARGS }} --ci env: From fa848a305bd457100995200bf4a48686fc50cffd Mon Sep 17 00:00:00 2001 From: Tyler Jang Date: Thu, 7 Dec 2023 15:22:18 -0800 Subject: [PATCH 2/4] bump version --- .github/actions/linter_tests/action.yaml | 2 +- .github/actions/tool_tests/action.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/linter_tests/action.yaml b/.github/actions/linter_tests/action.yaml index bb976fb92..0bc5897ff 100644 --- a/.github/actions/linter_tests/action.yaml +++ b/.github/actions/linter_tests/action.yaml @@ -80,7 +80,7 @@ runs: - name: Run plugin tests if: runner.os != 'Windows' # trunk-ignore(semgrep/yaml.github-actions.security.third-party-action-not-pinned-to-commit-sha.third-party-action-not-pinned-to-commit-sha) - uses: trunk-io/breakpoint@v1 + uses: trunk-io/breakpoint@v1.3.0 with: breakpoint-id: trunk-plugins-linter-tests shell: bash diff --git a/.github/actions/tool_tests/action.yaml b/.github/actions/tool_tests/action.yaml index 938952395..1aabf985f 100644 --- a/.github/actions/tool_tests/action.yaml +++ b/.github/actions/tool_tests/action.yaml @@ -60,7 +60,7 @@ runs: - name: Run plugin tests if: runner.os != 'Windows' # trunk-ignore(semgrep/yaml.github-actions.security.third-party-action-not-pinned-to-commit-sha.third-party-action-not-pinned-to-commit-sha) - uses: trunk-io/breakpoint@v1 + uses: trunk-io/breakpoint@v1.3.0 with: breakpoint-id: trunk-plugins-tool-tests shell: bash From ea4b25f6ea34b3e3e31f127a3f144d0a52fe5995 Mon Sep 17 00:00:00 2001 From: Tyler Jang Date: Thu, 7 Dec 2023 15:23:51 -0800 Subject: [PATCH 3/4] break test --- linters/golangci-lint/golangci_lint.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linters/golangci-lint/golangci_lint.test.ts b/linters/golangci-lint/golangci_lint.test.ts index 6ed3b66ce..dc46bad84 100644 --- a/linters/golangci-lint/golangci_lint.test.ts +++ b/linters/golangci-lint/golangci_lint.test.ts @@ -21,7 +21,7 @@ const addEmpty = (driver: TrunkLintDriver) => { customLinterCheckTest({ linterName: "golangci-lint", testName: "empty", - args: "-a", + args: "-a --foo", preCheck: addEmpty, skipTestIf: skipOS(["win32"]), }); From 8886f8d0cd7505fb30e1e373cda6426d6f76cd6b Mon Sep 17 00:00:00 2001 From: Tyler Jang Date: Thu, 7 Dec 2023 15:39:31 -0800 Subject: [PATCH 4/4] fix test --- linters/golangci-lint/golangci_lint.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linters/golangci-lint/golangci_lint.test.ts b/linters/golangci-lint/golangci_lint.test.ts index dc46bad84..6ed3b66ce 100644 --- a/linters/golangci-lint/golangci_lint.test.ts +++ b/linters/golangci-lint/golangci_lint.test.ts @@ -21,7 +21,7 @@ const addEmpty = (driver: TrunkLintDriver) => { customLinterCheckTest({ linterName: "golangci-lint", testName: "empty", - args: "-a --foo", + args: "-a", preCheck: addEmpty, skipTestIf: skipOS(["win32"]), });