Skip to content

Commit cf4a9c5

Browse files
authored
(Chore): Various repo cleanup and support quarantining (#905)
Clean up some old todos and change the nightly+weekly cadences slightly to hopefully be less flaky. Also adds the setup needed to support quarantining Successful [run](https://github.com/trunk-io/plugins/actions/runs/11678088415/job/32517018048?pr=905) verifying intended functionality
1 parent c45aa94 commit cf4a9c5

11 files changed

Lines changed: 17 additions & 20 deletions

File tree

.github/actions/action_tests/action.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ runs:
5555
run: npm test ${{ inputs.append-args }} ${{ env.PLATFORM_APPEND_ARGS }} --passWithNoTests --ci
5656
shell: bash
5757
working-directory: ${{ inputs.path }}
58+
continue-on-error: true
5859
env:
5960
JEST_SUITE_NAME: Action Tests
6061
PLUGINS_TEST_CLI_VERSION: ${{ inputs.cli-version }}
@@ -80,6 +81,6 @@ runs:
8081
junit-paths: junit.xml
8182
org-slug: trunk-staging-org
8283
token: ${{ inputs.trunk-staging-token }}
83-
continue-on-error: true
84+
quarantine: true
8485
env:
8586
TRUNK_PUBLIC_API_ADDRESS: https://api.trunk-staging.io

.github/actions/linter_tests/action.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,14 @@ runs:
9898
run: npm test ${{ inputs.append-args }} ${{ env.PLATFORM_APPEND_ARGS }} --ci
9999
shell: bash
100100
working-directory: ${{ inputs.path }}
101+
continue-on-error: true
101102
env:
102103
PLUGINS_TEST_LINTER_VERSION: ${{ inputs.linter-version }}
103104
PLUGINS_TEST_CLI_VERSION: ${{ inputs.cli-version }}
104105
PLUGINS_TEST_CLI_PATH: ${{ env.CLI_PATH }}
105106
SOURCERY_TOKEN: ${{ inputs.sourcery-token }}
106107
# Debug recurrent eslint circular JSON errors
107-
DEBUG: Driver:eslint:*,Driver:nixpkgs-fmt:*
108+
DEBUG: Driver:eslint:*,Driver:nixpkgs-fmt:*,Driver:trunk-toolbox:*
108109
JEST_SUITE_NAME: Linter Tests
109110
JEST_JUNIT_SUITE_NAME:
110111
"{title} ${{ runner.os }} ${{ inputs.ref-type }} ${{ inputs.linter-version }}"
@@ -129,6 +130,6 @@ runs:
129130
junit-paths: junit.xml
130131
org-slug: trunk-staging-org
131132
token: ${{ inputs.trunk-staging-token }}
132-
continue-on-error: true
133+
quarantine: true
133134
env:
134135
TRUNK_PUBLIC_API_ADDRESS: https://api.trunk-staging.io

.github/actions/tool_tests/action.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ runs:
7171
run: npm test ${{ inputs.append-args }} ${{ env.PLATFORM_APPEND_ARGS }} --ci
7272
shell: bash
7373
working-directory: ${{ inputs.path }}
74+
continue-on-error: true
7475
env:
7576
PLUGINS_TEST_CLI_VERSION: ${{ inputs.cli-version }}
7677
PLUGINS_TEST_CLI_PATH: ${{ env.CLI_PATH }}
@@ -97,6 +98,6 @@ runs:
9798
junit-paths: junit.xml
9899
org-slug: trunk-staging-org
99100
token: ${{ inputs.trunk-staging-token }}
100-
continue-on-error: true
101+
quarantine: true
101102
env:
102103
TRUNK_PUBLIC_API_ADDRESS: https://api.trunk-staging.io

.github/dependabot.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ updates:
55
schedule:
66
interval: weekly
77
day: sunday
8-
# trunk-ignore(yamllint/quoted-strings)
9-
time: "08:00" # UTC
8+
time: "10:00" # UTC
109
groups:
1110
dependencies:
1211
patterns:
@@ -18,13 +17,9 @@ updates:
1817
schedule:
1918
interval: weekly
2019
day: sunday
21-
# trunk-ignore(yamllint/quoted-strings)
22-
time: "08:00" # UTC
20+
time: "10:00" # UTC
2321
groups:
2422
dependencies:
2523
patterns:
2624
- "*"
27-
# TODO(Tyler): Readd once eslint9 is resolved.
28-
ignore:
29-
- dependency-name: eslint
3025
open-pull-requests-limit: 2

.github/workflows/nightly.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: Nightly
22
on:
33
schedule:
4-
# Times in UTC (PST+8), this translates to running Mon-Fri at midnight/1am (depending on DST)
5-
- cron: 0 8 * * 1-5
4+
# Times in UTC (PST+8), this translates to running Mon-Fri at 2am/3am (depending on DST)
5+
- cron: 0 10 * * 1-5
66
# Only enable on pull requests for testing
77
# pull_request:
88
# paths: [.github/workflows/nightly.yaml]

.github/workflows/upgrade_trunk.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: Upgrade Trunk Weekly
22
on:
33
schedule:
4-
# Weekly at midnight W morning
5-
- cron: 0 8 * * 3
4+
# Weekly W morning
5+
- cron: 0 10 * * 3
66
workflow_dispatch: {}
77

88
permissions: read-all

.github/workflows/windows_nightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Windows Tests
22
on:
3-
# TODO(Tyler): Preserve this workflow for testing, but in the future we'll want to remove it.
3+
# NOTE(Tyler): Preserve this workflow for testing, but in the future we'll want to remove it.
44
workflow_dispatch: {}
55

66
permissions: read-all

linters/ansible-lint/plugin.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
version: 0.1
22
tools:
33
definitions:
4-
# TODO(Tyler): Once we can make ansible its own tool without breaking upgrade, this should be extracted into its own tool directory
54
- name: ansible-lint
65
runtime: python
76
package: ansible-lint

linters/plugin.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,6 @@ lint:
455455

456456
- name: postcss
457457
extensions:
458-
# TODO(Tyler): Do we want to include css here as well?
459458
- pcss
460459
- postcss
461460

linters/scalafmt/plugin.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,5 @@ lint:
4646
parse_regex: scalafmt ${semver}
4747
run: scalafmt --version
4848
known_good_version: 3.4.3
49+
# We don't support this semver format, and it's a prerelease
50+
known_bad_versions: [3.8.4-RC1]

0 commit comments

Comments
 (0)