Skip to content

Commit 3f73407

Browse files
authoredMay 29, 2024
Merge pull request #11 from grafana/elliot/fix-publish-workflow
fixing publish workflow
2 parents d1ff35a + f9d6dd1 commit 3f73407

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed
 

‎.github/workflows/publish-npm.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,17 @@ jobs:
2525
with:
2626
cmd: install --frozen-lockfile
2727

28-
- name: Run tests
29-
uses: borales/actions-yarn@v4
30-
with:
31-
cmd: test
28+
- name: Run test manually
29+
run: |
30+
cd packages/faro-rollup/src/test
31+
yarn install
32+
cd ../..
33+
yarn install
34+
cd ../faro-webpack/src/test
35+
yarn install
36+
yarn build
37+
cd ../../..
38+
yarn test
3239
3340
- name: Build production bundle
3441
uses: borales/actions-yarn@v4

‎.github/workflows/run-tests.yml

+9-11
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,25 @@ jobs:
1313
ref: ${{ github.event.pull_request.head.ref }}
1414
fetch-depth: 0
1515

16-
- name: Install dependencies
17-
uses: borales/actions-yarn@v5
18-
with:
19-
cmd: install --frozen-lockfile
20-
2116
- name: Setup NPM
2217
uses: actions/setup-node@v3
2318
with:
24-
node-version: 18.x
19+
node-version: 19.x
2520
registry-url: "https://registry.npmjs.org"
2621

22+
- name: Install dependencies
23+
uses: borales/actions-yarn@v5
24+
with:
25+
cmd: install --frozen-lockfile
26+
2727
- name: Run test manually
2828
run: |
29-
yarn install --frozen-lockfile
30-
yarn build
3129
cd packages/faro-rollup/src/test
32-
yarn install --pure-lockfile
30+
yarn install
3331
cd ../..
34-
yarn install --pure-lockfile
32+
yarn install
3533
cd ../faro-webpack/src/test
36-
yarn install --pure-lockfile
34+
yarn install
3735
yarn build
3836
cd ../../..
3937
yarn test

‎packages/faro-rollup/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"ava": "^3.8.1"
2121
},
2222
"dependencies": {
23-
"@grafana/faro-bundlers-shared": "^0.0.13",
23+
"@grafana/faro-bundlers-shared": "~0.0",
2424
"cross-fetch": "^4.0.0",
2525
"magic-string": "^0.30.5",
2626
"rollup": "^4.1.1"

‎packages/faro-webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"test": "ava src/index.test.js"
1818
},
1919
"dependencies": {
20-
"@grafana/faro-bundlers-shared": "^0.0.13",
20+
"@grafana/faro-bundlers-shared": "~0.0",
2121
"@rollup/plugin-babel": "^6.0.4",
2222
"@rollup/plugin-node-resolve": "^15.2.3",
2323
"cross-fetch": "^4.0.0",

0 commit comments

Comments
 (0)
Please sign in to comment.