Skip to content

Commit 451fcd3

Browse files
authored
Merge pull request #7 from contractual-dev/remove_yarn_from_actions
remove lerna fix pipelines
2 parents 0149b98 + a0a1d27 commit 451fcd3

File tree

6 files changed

+61
-3018
lines changed

6 files changed

+61
-3018
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ jobs:
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v4
19-
20-
- name: Install pnpm
21-
uses: pnpm/action-setup@v4
22-
with:
23-
version: 9.15.4
19+
20+
2421
- name: Use Node ${{ matrix.node-version }}
2522
uses: actions/setup-node@v4
2623
with:
2724
node-version: ${{ matrix.node-version }}
28-
25+
- name: Install pnpm
26+
uses: pnpm/action-setup@v4
27+
with:
28+
version: 9.15.4
2929
- uses: actions/cache@v2
3030
with:
3131
path: '**/node_modules'
@@ -43,12 +43,15 @@ jobs:
4343
steps:
4444
- name: Checkout
4545
uses: actions/checkout@v4
46-
4746
- name: Setup Node
4847
uses: actions/setup-node@v4
4948
with:
5049
node-version: '22.x'
51-
50+
- name: Install pnpm
51+
uses: pnpm/action-setup@v4
52+
with:
53+
version: 9.15.4
54+
5255
- uses: actions/cache@v2
5356
with:
5457
path: '**/node_modules'
@@ -77,6 +80,10 @@ jobs:
7780
uses: actions/setup-node@v4
7881
with:
7982
node-version: '22.x'
83+
- name: Install pnpm
84+
uses: pnpm/action-setup@v4
85+
with:
86+
version: 9.15.4
8087

8188
- uses: actions/cache@v2
8289
with:

.github/workflows/publish-packages.yml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,13 @@ jobs:
6262
uses: actions/setup-node@v4
6363
with:
6464
node-version: ${{ matrix.node-version }}
65-
66-
- name: Yarn
67-
run: yarn --frozen-lockfile
65+
- name: Install pnpm
66+
uses: pnpm/action-setup@v4
67+
with:
68+
version: 9.15.4
69+
70+
- name: PNPM
71+
run: pnpm install --frozen-lockfile
6872

6973
- name: Run Verdaccio Docker
7074
run: |
@@ -74,7 +78,7 @@ jobs:
7478
verdaccio/verdaccio
7579
7680
- name: Build
77-
run: yarn build
81+
run: pnpm build
7882

7983
- name: Setup Registry
8084
uses: actions/setup-node@v4
@@ -102,16 +106,11 @@ jobs:
102106
103107
- name: Publish Packages
104108
run: |
105-
yarn lerna publish from-package --yes \
106-
--no-git-tag-version \
107-
--no-push \
108-
--no-changelog \
109-
--no-commit-hooks \
110-
--no-git-reset \
111-
--exact \
112-
--force-publish \
113-
--dist-tag ci
114-
109+
pnpm publish -r \
110+
--no-git-checks \
111+
--access public \
112+
--tag ci \
113+
--force
115114
- name: Setup and Test
116115
run: |
117116
IFS='/' read -r library framework <<< "${{ matrix.e2e-project }}"
@@ -148,14 +147,18 @@ jobs:
148147
registry-url: https://registry.npmjs.org/
149148
scope: '@suites'
150149
always-auth: true
150+
- name: Install pnpm
151+
uses: pnpm/action-setup@v4
152+
with:
153+
version: 9.15.4
151154

152-
- name: Yarn
153-
run: yarn --frozen-lockfile
155+
- name: pnpm
156+
run: pnpm install --frozen-lockfile
154157

155158
- name: Build
156-
run: npx lerna run build
159+
run: pnpm build
157160

158161
- name: Publish Packages
159-
run: npx lerna publish ${{ github.event.inputs.strategy }} --yes --dist-tag ${{ github.event.inputs.dist_tag }}
162+
run: pnpm publish -r ${{ github.event.inputs.strategy }} --access public --tag ${{ github.event.inputs.dist_tag }}
160163
env:
161164
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/release-packages.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,27 @@ jobs:
5858
- name: Prerelease Version (Exact Version)
5959
if: ${{ github.event.inputs.release_type == 'prerelease' && github.event.inputs.exact_version }}
6060
run: |
61-
npx lerna version ${{ github.event.inputs.exact_version }} --yes --no-changelog
61+
pnpm version ${{ github.event.inputs.exact_version }} \
62+
--workspaces-update \
63+
--no-git-tag-version \
64+
--no-commit-hooks
6265
env:
6366
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6467

6568
- name: Prerelease Version
6669
if: ${{ github.event.inputs.release_type == 'prerelease' && !github.event.inputs.exact_version }}
6770
run: |
68-
npx lerna version prerelease --yes \
71+
pnpm version prerelease \
6972
--preid ${{ github.event.inputs.preid }} \
70-
--no-changelog
73+
--workspaces-update \
74+
--no-git-tag-version \
75+
--no-commit-hooks
7176
env:
7277
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7378

7479
- name: Graduate Version
7580
if: ${{ github.event.inputs.release_type == 'graduate' }}
76-
run: npx lerna version graduate --yes
81+
run: pnpm version --workspaces-update from-git
7782
env:
7883
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7984

.github/workflows/set-coverage.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ jobs:
2828
- uses: actions/cache@v2
2929
with:
3030
path: '**/node_modules'
31-
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
31+
key: ${{ runner.os }}-modules-${{ hashFiles('**/pnpm-lock.yaml') }}
3232

33-
- name: Yarn
34-
run: yarn --frozen-lockfile
33+
- name: pnpm
34+
run: pnpm install --frozen-lockfile
3535

3636
- name: Create Coverage Directory
3737
run: mkdir -p ${{ github.workspace }}/coverage
3838

3939
- name: Test
40-
run: yarn lerna exec yarn test --scope @suites/${{ matrix.project }}
40+
run: pnpm --filter @contractual/${{ matrix.project }} run test
4141
env:
4242
JEST_JUNIT_OUTPUT_NAME: ${{ matrix.project }}.xml
4343
JEST_JUNIT_OUTPUT_DIR: ${{ github.workspace }}/test-reports

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"jest": "^29.7.0",
4646
"jest-environment-node": "29.1.0",
4747
"jest-junit": "^16.0.0",
48-
"lerna": "^7.3.1",
4948
"lint-staged": "^14.0.1",
5049
"madge": "^7.0.0",
5150
"micromatch": "4.0.8",

0 commit comments

Comments
 (0)