Skip to content

Commit 1c47e57

Browse files
authored
ci(canary): Fix canary tests (#11502)
Fixes the Canary tests by ensuring we cache node modules and files in dev-packages as well. In the debugging process, I also moved a few things around - e.g. the playwright dependency stuff now happens in CI, not in the build commands everywhere.
1 parent 4676ca3 commit 1c47e57

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

.github/workflows/canary.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ on:
1212
env:
1313
HEAD_COMMIT: ${{ github.event.inputs.commit || github.sha }}
1414

15+
CACHED_BUILD_PATHS: |
16+
${{ github.workspace }}/packages/*/*.tgz
17+
${{ github.workspace }}/dev-packages/event-proxy-server/build
18+
${{ github.workspace }}/node_modules
19+
${{ github.workspace }}/packages/*/node_modules
20+
${{ github.workspace }}/dev-packages/*/node_modules
21+
1522
permissions:
1623
contents: read
1724
issues: write
@@ -33,10 +40,7 @@ jobs:
3340
- name: Check canary cache
3441
uses: actions/cache@v4
3542
with:
36-
path: |
37-
${{ github.workspace }}/packages/*/*.tgz
38-
${{ github.workspace }}/node_modules
39-
${{ github.workspace }}/packages/*/node_modules
43+
path: ${{ env.CACHED_BUILD_PATHS }}
4044
key: canary-${{ env.HEAD_COMMIT }}
4145
- name: Install dependencies
4246
run: yarn install
@@ -94,24 +98,22 @@ jobs:
9498
- uses: pnpm/action-setup@v2
9599
with:
96100
version: 8.3.1
101+
97102
- name: Set up Node
98103
uses: actions/setup-node@v4
99104
with:
100-
node-version-file: 'package.json'
105+
node-version-file: 'dev-packages/e2e-tests/package.json'
101106

102107
- name: Restore canary cache
103108
uses: actions/cache/restore@v4
104109
with:
105-
path: |
106-
${{ github.workspace }}/packages/*/*.tgz
107-
${{ github.workspace }}/node_modules
108-
${{ github.workspace }}/packages/*/node_modules
110+
path: ${{ env.CACHED_BUILD_PATHS }}
109111
key: canary-${{ env.HEAD_COMMIT }}
110112

111113
- name: Get node version
112114
id: versions
113115
run: |
114-
echo "echo node=$(jq -r '.volta.node' package.json)" >> $GITHUB_OUTPUT
116+
echo "echo node=$(jq -r '.volta.node' dev-packages/e2e-tests/package.json)" >> $GITHUB_OUTPUT
115117
116118
- name: Validate Verdaccio
117119
run: yarn test:validate

dev-packages/event-proxy-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"build:types": "tsc -p tsconfig.types.json",
4040
"clean": "rimraf -g ./node_modules ./build"
4141
},
42-
"dependencies": {
42+
"devDependencies": {
4343
"@sentry/types": "8.0.0-alpha.9",
4444
"@sentry/utils": "8.0.0-alpha.9"
4545
},

0 commit comments

Comments
 (0)