Skip to content

Commit aba3260

Browse files
ci(changesets): disable auto-merging (#9918)
* ci(changesets): disable auto-merging * Fix knip
1 parent 1f0ec12 commit aba3260

File tree

3 files changed

+31
-30
lines changed

3 files changed

+31
-30
lines changed

.github/workflows/release.yml

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ jobs:
3737
- name: Stop Nx Agents
3838
if: ${{ always() }}
3939
run: npx nx-cloud stop-all-agents
40-
- name: Check for Changesets marked as major
41-
id: major
42-
run: |
43-
echo "found=false" >> $GITHUB_OUTPUT
44-
regex="(major)"
45-
shopt -s nullglob
46-
for file in .changeset/*.md; do
47-
if [[ $(cat $file) =~ $regex ]]; then
48-
echo "found=true" >> $GITHUB_OUTPUT
49-
fi
50-
done
40+
# - name: Check for Changesets marked as major
41+
# id: major
42+
# run: |
43+
# echo "found=false" >> $GITHUB_OUTPUT
44+
# regex="(major)"
45+
# shopt -s nullglob
46+
# for file in .changeset/*.md; do
47+
# if [[ $(cat $file) =~ $regex ]]; then
48+
# echo "found=true" >> $GITHUB_OUTPUT
49+
# fi
50+
# done
5151
- name: Run Changesets (version or publish)
5252
id: changesets
5353
uses: changesets/action@v1.5.3
@@ -59,18 +59,23 @@ jobs:
5959
env:
6060
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6161
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
62-
- name: Auto-merge Changesets PR
63-
if: steps.changesets.outputs.hasChangesets == 'true' && steps.major.outputs.found == 'false'
64-
run: |
65-
gh pr merge --squash "$PR_NUMBER"
66-
gh api --method POST /repos/$REPO/dispatches -f 'event_type=release'
67-
env:
68-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
69-
REPO: ${{ github.repository }}
70-
PR_NUMBER: ${{ steps.changesets.outputs.pullRequestNumber }}
62+
# - name: Auto-merge Changesets PR
63+
# if: steps.changesets.outputs.hasChangesets == 'true' && steps.major.outputs.found == 'false'
64+
# run: |
65+
# gh pr merge --squash "$PR_NUMBER"
66+
# gh api --method POST /repos/$REPO/dispatches -f 'event_type=release'
67+
# env:
68+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
69+
# REPO: ${{ github.repository }}
70+
# PR_NUMBER: ${{ steps.changesets.outputs.pullRequestNumber }}
7171
- name: Upload coverage to Codecov
7272
uses: codecov/codecov-action@v4.6.0
7373
with:
7474
directory: packages
7575
env:
7676
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
77+
- name: Comment on PRs about release
78+
if: steps.changesets.outputs.published == 'true'
79+
uses: tanstack/config/.github/comment-on-release@main
80+
with:
81+
published-packages: ${{ steps.changesets.outputs.publishedPackages }}

knip.json

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
"@types/react",
1111
"@types/react-dom",
1212
"react",
13-
"react-dom",
14-
"markdown-link-extractor"
13+
"react-dom"
1514
],
1615
"ignoreWorkspaces": ["examples/**", "integrations/**"],
1716
"workspaces": {
1817
"packages/angular-query-experimental": {
19-
"entry": ["src/index.ts", "src/inject-queries-experimental/index.ts"]
18+
"entry": [
19+
"src/devtools/production/index.ts",
20+
"src/devtools-panel/production/index.ts"
21+
]
2022
},
2123
"packages/query-codemods": {
2224
"entry": ["src/v4/**/*.cjs", "src/v5/**/*.cjs"],
@@ -25,12 +27,6 @@
2527
"packages/vue-query": {
2628
"ignore": ["**/__mocks__/**"],
2729
"ignoreDependencies": ["vue2", "vue2.7"]
28-
},
29-
"packages/angular-query-experimental": {
30-
"entry": [
31-
"src/devtools/production/index.ts",
32-
"src/devtools-panel/production/index.ts"
33-
]
3430
}
3531
}
3632
}

packages/solid-query-devtools/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"types": "./build/index.d.ts",
4040
"browser": {},
4141
"exports": {
42-
"@tanstack/custom-condition": "./src/index.ts",
42+
"@tanstack/custom-condition": "./src/index.tsx",
4343
"solid": {
4444
"development": "./build/dev.jsx",
4545
"import": "./build/index.jsx"

0 commit comments

Comments
 (0)