Skip to content

Commit 3153375

Browse files
committed
chore: fix ci
1 parent 1b29e27 commit 3153375

File tree

13 files changed

+72
-23758
lines changed

13 files changed

+72
-23758
lines changed

.github/workflows/nodejs.yml

+34-40
Original file line numberDiff line numberDiff line change
@@ -9,89 +9,83 @@ on:
99
jobs:
1010
test:
1111
name: Test packages
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616

17-
- uses: pnpm/[email protected]
17+
- name: Set Node.js 18.x
18+
uses: actions/setup-node@v3
1819
with:
19-
version: 6.22.2
20+
node-version: 18.x
21+
cache: 'yarn'
2022

21-
- name: Use Node.js 14.x
22-
uses: actions/setup-node@v2
23-
with:
24-
node-version: 14.x
25-
cache: 'pnpm'
23+
- name: Enable corepack
24+
run: corepack enable
2625

2726
- name: Install Dependencies
28-
run: pnpm install
27+
run: yarn install
2928

3029
- name: Check lint
31-
run: pnpm run test:lint
30+
run: yarn run test:lint
3231

3332
- name: Compile packages
34-
run: pnpm run compile
33+
run: yarn run compile
3534

3635
- name: Docker compose
3736
run: docker-compose up -d
3837

3938
- name: Run tests
40-
run: pnpm run coverage
39+
run: yarn run coverage
4140

4241
- name: Upload coverage
43-
uses: codecov/codecov-action@v1
42+
uses: codecov/codecov-action@v3
4443

4544
test-examples:
4645
name: Test examples
47-
runs-on: ubuntu-20.04
46+
runs-on: ubuntu-22.04
4847

4948
steps:
50-
- uses: actions/checkout@v2
49+
- uses: actions/checkout@v3
5150

52-
- uses: pnpm/[email protected]
51+
- name: Set Node.js 18.x
52+
uses: actions/setup-node@v3
5353
with:
54-
version: 6.22.2
54+
node-version: 18.x
55+
cache: 'yarn'
5556

56-
- name: Use Node.js 14.x
57-
uses: actions/setup-node@v2
58-
with:
59-
node-version: 14.x
60-
cache: 'pnpm'
57+
- name: Enable corepack
58+
run: corepack enable
6159

6260
- name: Install Dependencies
63-
run: pnpm install
61+
run: yarn install
6462

6563
- name: Compile packages
66-
run: pnpm run compile
64+
run: yarn run compile
6765

6866
- name: Test examples
69-
run: pnpm run test:examples
67+
run: yarn run test:examples
7068
env:
7169
REACT_APP_API_URL: http://localhost:3000
7270

7371
test-documentation:
7472
name: Test documentation
75-
runs-on: ubuntu-20.04
73+
runs-on: ubuntu-22.04
7674

7775
steps:
78-
- uses: actions/checkout@v2
76+
- uses: actions/checkout@v3
7977

80-
- uses: pnpm/[email protected]
78+
- name: Set Node.js 18.x
79+
uses: actions/setup-node@v3
8180
with:
82-
version: 6.22.2
81+
node-version: 18.x
82+
cache: 'yarn'
8383

84-
- name: Use Node.js 14.x
85-
uses: actions/setup-node@v2
86-
with:
87-
node-version: 14.x
88-
cache: 'pnpm'
84+
- name: Enable corepack
85+
run: corepack enable
8986

9087
- name: Install Dependencies
91-
run: pnpm install
88+
run: yarn install
9289

9390
- name: Test documentation
94-
run: |
95-
cd website
96-
pnpm run generate-api-docs
97-
pnpm run build
91+
run: yarn workspace accounts-js run build

.github/workflows/release.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,36 @@ on:
88
jobs:
99
release:
1010
name: Release
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Checkout Repo
1414
uses: actions/checkout@master
1515
with:
1616
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
1717
fetch-depth: 0
1818

19-
- name: Setup Node.js 14.x
19+
- name: Set Node.js 18.x
2020
uses: actions/setup-node@master
2121
with:
22-
node-version: 14.x
22+
node-version: 18.x
2323

24-
- name: Cache .pnpm-store
25-
uses: actions/cache@v1
24+
- name: Cache .yarn
25+
uses: actions/cache@v3
2626
with:
27-
path: ~/.pnpm-store
28-
key: ${{ runner.os }}-node14-${{ hashFiles('**/pnpm-lock.yaml') }}
27+
path: ~/.yarn
28+
key: ${{ runner.os }}-node18-${{ hashFiles('**/yarn.lock') }}
2929

30-
- name: Install pnpm
31-
run: curl -f https://get.pnpm.io/v6.7.js | node - add --global pnpm@6
30+
- name: Enable corepack
31+
run: corepack enable
3232

3333
- name: Install Dependencies
34-
run: pnpm install
34+
run: yarn install
3535

3636
- name: Create Release Pull Request
3737
uses: changesets/action@master
3838
with:
39-
version: pnpm run version
40-
publish: pnpm run release
39+
version: yarn run version
40+
publish: yarn run release
4141
commit: 'chore: update versions'
4242
title: 'chore: version packages'
4343
env:

examples/accounts-microservice/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
Includes two examples of using `@accounts/boost`.
44

5-
`pnpm run start:mono` - Starts a GraphQL server which consumes the `@accounts/boost` typeDefs and resolvers when building your app's schema.
5+
`yarn run start:mono` - Starts a GraphQL server which consumes the `@accounts/boost` typeDefs and resolvers when building your app's schema.
66

7-
`pnpm run start:micro` - Starts a `@accounts/boost` as a GraphQL microservice which is then stitched with your app's schema.
7+
`yarn run start:micro` - Starts a `@accounts/boost` as a GraphQL microservice which is then stitched with your app's schema.

examples/graphql-server-typeorm-postgres/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ This example demonstrate how to use [accounts-js](https://github.com/accounts-js
77
In order to be able to run this example on your machine you first need to do the following steps:
88

99
- Clone the repository `git clone [email protected]:accounts-js/accounts.git`
10-
- Install project dependencies: `pnpm install`
11-
- Compile the packages `pnpm run compile`
10+
- Install project dependencies: `yarn install`
11+
- Compile the packages `yarn run compile`
1212
- Go to the example folder `cd examples/graphql-server-typeorm-postgres`
1313

1414
## Prerequisites
@@ -22,7 +22,7 @@ docker-compose up -d
2222
to start a new one.
2323

2424
If you have postgres already installed on your system, you can just edit the .env file and use your current postgres data instead of the supplied Docker image.
25-
Alternatively you can simply prepend the `DATABASE_URL` and `ACCOUNTS_SECRET` environmental variables to your `pnpm run start` command.
25+
Alternatively you can simply prepend the `DATABASE_URL` and `ACCOUNTS_SECRET` environmental variables to your `yarn run start` command.
2626

2727
## Getting Started
2828

@@ -31,7 +31,7 @@ Start the app.
3131
Visit <http://localhost:4000/>
3232

3333
```bash
34-
pnpm run start
34+
yarn run start
3535
```
3636

3737
-> [Start the client side](../react-graphql-typescript).

examples/graphql-server-typescript/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ This example demonstrate how to use [accounts-js](https://github.com/accounts-js
77
In order to be able to run this example on your machine you first need to do the following steps:
88

99
- Clone the repository `git clone [email protected]:accounts-js/accounts.git`
10-
- Install project dependencies: `pnpm install`
11-
- Compile the packages `pnpm run compile`
10+
- Install project dependencies: `yarn install`
11+
- Compile the packages `yarn run compile`
1212
- Go to the example folder `cd examples/graphql-server-typescript`
1313

1414
## Prerequisites
@@ -28,7 +28,7 @@ Start the app.
2828
Visit http://localhost:4000/
2929

3030
```bash
31-
pnpm run start
31+
yarn run start
3232
```
3333

3434
-> [Start the client side](../react-graphql-typescript).

examples/magic-link-server-typescript/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ This example demonstrate how to use setup [accounts-js](https://github.com/accou
77
In order to be able to run this example on your machine you first need to do the following steps:
88

99
- Clone the repository `git clone [email protected]:accounts-js/accounts.git`
10-
- Install project dependencies: `pnpm install`
11-
- Compile the packages `pnpm run compile`
10+
- Install project dependencies: `yarn install`
11+
- Compile the packages `yarn run compile`
1212
- Go to the example folder `cd examples/magic-link-server-typescript`
1313

1414
## Prerequisites
@@ -29,7 +29,7 @@ for a more comprehensive example of general accounts use.
2929
To run the example:
3030

3131
```bash
32-
pnpm run start
32+
yarn run start
3333
```
3434

3535
You should see output on the console suggesting that authenticating using a token was

examples/react-graphql-typescript/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ This example demonstrate how to use [accounts-js](https://github.com/accounts-js
77
In order to be able to run this example on your machine you first need to do the following steps:
88

99
- Clone the repository `git clone [email protected]:accounts-js/accounts.git`
10-
- Install project dependencies: `pnpm install`
11-
- Compile the packages `pnpm run compile`
10+
- Install project dependencies: `yarn install`
11+
- Compile the packages `yarn run compile`
1212
- Go to the example folder `cd examples/react-graphql-typescript`
1313

1414
## Getting Started
@@ -18,7 +18,7 @@ If you haven't started the example server side, [go ahead to start it first](../
1818
Start the app.
1919

2020
```bash
21-
pnpm run start
21+
yarn run start
2222
```
2323

2424
Open a browser and navigate to [http://localhost:3000](http://localhost:3000).

examples/react-rest-typescript/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ In order to get the example running you also need to start the [REST server](htt
99
In order to be able to run this example on your machine you first need to do the following steps:
1010

1111
- Clone the repository `git clone [email protected]:accounts-js/accounts.git`
12-
- Install project dependencies: `pnpm install`
13-
- Compile the packages `pnpm run compile`
12+
- Install project dependencies: `yarn install`
13+
- Compile the packages `yarn run compile`
1414
- Go to the example folder `cd examples/react-rest-typescript`
1515

1616
## Getting Started
1717

1818
Start the app.
1919

2020
```
21-
pnpm run start
21+
yarn run start
2222
```
2323

2424
Open a browser and navigate to [http://localhost:3000](http://localhost:3000).

examples/rest-express-typescript/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ You must have a mongodb server running before starting the server.
99
In order to be able to run this example on your machine you first need to do the following steps:
1010

1111
- Clone the repository `git clone [email protected]:accounts-js/accounts.git`
12-
- Install project dependencies: `pnpm install`
13-
- Compile the packages `pnpm run compile`
12+
- Install project dependencies: `yarn install`
13+
- Compile the packages `yarn run compile`
1414
- Go to the example folder `cd examples/rest-express-typescript`
1515

1616
## Getting Started
1717

1818
Start the app.
1919

2020
```
21-
pnpm run start
21+
yarn run start
2222
```
2323

2424
Open a browser and navigate to [http://localhost:4000](http://localhost:4000).

netlify.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[build]
22
base = "."
33
publish = "website/build"
4-
command = "npx pnpm install --store=node_modules/.pnpm-store && cd website && npm run generate-api-docs && npm run build"
4+
command = "yarn install && yarn workspace accounts-js run build"
55

66
[build.environment]
7-
NODE_VERSION = "14"
7+
NODE_VERSION = "18"
88
NPM_FLAGS = "--version"

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"test:examples": "lerna run test --scope=\"@examples/*\"",
1515
"coverage": "lerna run coverage",
1616
"codecov": "codecov",
17-
"version": "pnpx changeset version && yarn install --lockfile-only",
18-
"release": "yarn run compile && pnpx changeset publish",
17+
"version": "yarn changeset version && yarn install --immutable",
18+
"release": "yarn run compile && yarn changeset publish",
1919
"reset": "yarn run clean; yarn run install; yarn run compile",
2020
"postinstall": "husky install"
2121
},

0 commit comments

Comments
 (0)