Skip to content

Commit 1e813c2

Browse files
committed
Merge branch 'master' into feat/trpc-v11
2 parents c2b7d14 + 8a8cc99 commit 1e813c2

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

.github/workflows/deploy.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,17 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@v4
23-
with:
24-
ref: master
25-
23+
2624
- uses: pnpm/action-setup@v3
2725
with:
28-
version: 8
29-
26+
version: 9
27+
3028
- uses: actions/setup-node@v4
3129
with:
3230
node-version: 20.x
3331
cache: pnpm
3432
registry-url: https://registry.npmjs.org
35-
33+
3634
- run: pnpm install --frozen-lockfile
3735

3836
- name: build

.github/workflows/release.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,12 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v4
3636
with:
37-
ref: master
3837
fetch-depth: 0
3938

4039
- uses: actions/setup-node@v4
4140
with:
4241
node-version: lts/*
4342

44-
- name: 🛤️ Version tag must be on master branch
45-
if: github.event_name == 'push'
46-
run: git branch --contains ${{ github.ref }} | grep master
47-
4843
- name: ⬆️ Bump version
4944
if: github.event_name == 'workflow_dispatch'
5045
id: bump-version

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@ export function useTRPC() {
152152

153153
## Acknowledgements
154154

155-
Huge thanks to [Robert Soriano](https://github.com/wobsoriano) for creating `nuxt-trpc`! We just adapted his work to work with Vue Query.
155+
Huge thanks to [Robert Soriano](https://github.com/wobsoriano) for creating `trpc-nuxt`! We just adapted his work to work with Vue Query.

0 commit comments

Comments
 (0)