Skip to content

Commit

Permalink
Merge branch 'main' into create
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaKGoldberg committed Dec 5, 2024
2 parents 3d0439d + a2c7295 commit efd1a8b
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/actions/prepare/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runs:
- uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
- uses: actions/setup-node@v4
with:
cache: pnpm
node-version: "20"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/accessibility-alt-text-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
if: ${{ !endsWith(github.actor, '[bot]') }}
runs-on: ubuntu-latest
steps:
- uses: github/accessibility-alt-text-bot@602a5efcf386c52ef8b9a11ead9bfa6ef8d56ba5 # v1.4.0
- uses: github/[email protected]

name: Accessibility Alt Text Bot

Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,66 +3,66 @@ jobs:
name: Are The Types Wrong?
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm build
- run: npx --yes @arethetypeswrong/cli --pack . --ignore-rules cjs-resolves-to-esm
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm build
- run: node ./lib/index.js
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm build
- run: pnpm lint
lint_knip:
name: Lint Knip
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm lint:knip
lint_markdown:
name: Lint Markdown
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm lint:md
lint_packages:
name: Lint Packages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm lint:packages
lint_spelling:
name: Lint Spelling
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm lint:spelling
prettier:
name: Prettier
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm format --list-different
test:
name: Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm run test --coverage
- if: always()
Expand All @@ -73,7 +73,7 @@ jobs:
name: Test Creation Script
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm run build
- run: pnpm run test:create
Expand All @@ -86,7 +86,7 @@ jobs:
name: Test Initialization Script
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm run build
- run: pnpm run test:initialize
Expand All @@ -99,7 +99,7 @@ jobs:
name: Test Migration Script
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm run build
- run: pnpm run test:migrate
Expand All @@ -112,7 +112,7 @@ jobs:
name: Type Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm tsc

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ jobs:
contributors:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: ./.github/actions/prepare
- env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
uses: JoshuaKGoldberg/all-contributors-auto-action@944abe4387e751b5bbb38616cb25cf4a4ca998f2 # v0.5.0
uses: JoshuaKGoldberg/[email protected]

name: Contributors

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/post-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ jobs:
post_release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
with:
fetch-depth: 0
- run: echo "npm_version=$(npm pkg get version | tr -d '"')" >> "$GITHUB_ENV"
- uses: apexskier/github-release-commenter@3bd413ad5e1d603bfe2282f9f06f2bdcec079327 # v1
- uses: apexskier/github-release-commenter@v1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
comment-template: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-review-requested.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jobs:
pr_review_requested:
runs-on: ubuntu-latest
steps:
- uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 # v1
- uses: actions-ecosystem/action-remove-labels@v1
with:
labels: "status: waiting for author"
- if: failure()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: main
Expand All @@ -14,7 +14,7 @@ jobs:
- env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
uses: JoshuaKGoldberg/release-it-action@77373cfc2535e21149518381cb09e1c04c6068fe # v0.2.2
uses: JoshuaKGoldberg/[email protected]

name: Release

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jobs:
create:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm run build
- run: pnpm run test:create
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-initialize.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jobs:
initialize:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm run build
- run: pnpm run test:initialize
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-migrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jobs:
migrate:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/checkout@v4
- uses: ./.github/actions/prepare
- run: pnpm run build
- run: pnpm run test:migrate
Expand Down
20 changes: 16 additions & 4 deletions script/__snapshots__/migrate-test-e2e.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ exports[`expected file changes > .github/workflows/ci.yml 1`] = `
- name: Test Creation Script
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- - uses: actions/checkout@v4
- - uses: ./.github/actions/prepare
- - run: pnpm run build
- - run: pnpm run test:create
Expand All @@ -39,7 +39,7 @@ exports[`expected file changes > .github/workflows/ci.yml 1`] = `
- name: Test Initialization Script
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- - uses: actions/checkout@v4
- - uses: ./.github/actions/prepare
- - run: pnpm run build
- - run: pnpm run test:initialize
Expand All @@ -52,7 +52,7 @@ exports[`expected file changes > .github/workflows/ci.yml 1`] = `
- name: Test Migration Script
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- - uses: actions/checkout@v4
- - uses: ./.github/actions/prepare
- - run: pnpm run build
- - run: pnpm run test:migrate
Expand Down Expand Up @@ -174,7 +174,7 @@ exports[`expected file changes > eslint.config.js 1`] = `
languageOptions: {
parserOptions: {
- projectService: {
- allowDefaultProject: ["*.config.*s", "bin/*.js", "script/*.ts"],
- allowDefaultProject: ["*.config.*s", "bin/*.js"],
- },
+ projectService: { allowDefaultProject: ["*.config.*s"] },
tsconfigRootDir: import.meta.dirname,
Expand Down Expand Up @@ -232,3 +232,15 @@ exports[`expected file changes > knip.json 1`] = `
+ "project": ["src/**/*.ts!"]
}"
`;
exports[`expected file changes > tsconfig.json 1`] = `
"--- a/tsconfig.json
+++ b/tsconfig.json
@@ ... @@
"strict": true,
"target": "ES2022"
},
- "include": ["src", "script"]
+ "include": ["src"]
}"
`;
1 change: 1 addition & 0 deletions script/migrate-test-e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const filesExpectedToBeChanged = [
".prettierignore",
"cspell.json",
"eslint.config.js",
"tsconfig.json",
];

const filesThatMightBeChanged = new Set([
Expand Down

0 comments on commit efd1a8b

Please sign in to comment.