Skip to content

Commit

Permalink
fix(repo): fix windows nightly runs (#16765)
Browse files Browse the repository at this point in the history
  • Loading branch information
meeroslav authored May 4, 2023
1 parent 8484a8e commit 68ae304
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 13 deletions.
26 changes: 15 additions & 11 deletions .github/workflows/e2e-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Install PNPM
run: |
npm install -g @pnpm/[email protected]
- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 8.3.1
run_install: false

- name: Set node
uses: actions/setup-node@v3
Expand All @@ -49,7 +51,6 @@ jobs:
key: ${{ runner.os }}-modules-${{ matrix.node_version }}-${{ github.run_id }}

- name: Install packages
if: steps.cache-modules.outputs.cache-hit != 'true'
run: pnpm install --frozen-lockfile

- name: Cache Cypress
Expand Down Expand Up @@ -90,7 +91,7 @@ jobs:
- e2e-node
- e2e-nx-init
- e2e-nx-misc
- e2e-nx-plugin
- e2e-plugin
- e2e-nx-run
- e2e-react-core
- e2e-react-extensions
Expand Down Expand Up @@ -128,7 +129,7 @@ jobs:
codeowners: 'S04SYHYKGNP'
- project: e2e-nx-misc
codeowners: 'S04SYHYKGNP'
- project: e2e-nx-plugin
- project: e2e-plugin
codeowners: 'S04SYHYKGNP'
- project: e2e-nx-run
codeowners: 'S04SYHYKGNP'
Expand Down Expand Up @@ -177,7 +178,7 @@ jobs:
- node_version: 16
project: e2e-nx-misc
- node_version: 16
project: e2e-nx-plugin
project: e2e-plugin
- node_version: 16
project: e2e-lerna-smoke-tests
- node_version: 16
Expand Down Expand Up @@ -219,7 +220,7 @@ jobs:
- node_version: 19
project: e2e-nx-misc
- node_version: 19
project: e2e-nx-plugin
project: e2e-plugin
- node_version: 19
project: e2e-lerna-smoke-tests
- node_version: 19
Expand Down Expand Up @@ -248,9 +249,11 @@ jobs:
- name: Prepare dir for output
run: mkdir -p outputs

- name: Install PNPM
run: |
npm install -g @pnpm/[email protected]
- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 8.3.1
run_install: false

- name: Use Node.js ${{ matrix.node_version }}
uses: actions/setup-node@v3
Expand Down Expand Up @@ -288,6 +291,7 @@ jobs:
- name: Run e2e tests
id: e2e-run
run: pnpm nx run ${{ matrix.project }}:e2e
shell: bash
timeout-minutes: 120
env:
GIT_AUTHOR_EMAIL: [email protected]
Expand Down
7 changes: 5 additions & 2 deletions scripts/nx-release.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node
import * as yargs from 'yargs';
import { execSync } from 'child_process';
import { existsSync, readFileSync, writeFileSync } from 'fs';
import { existsSync, readFileSync, rmSync, writeFileSync } from 'fs';
import { URL } from 'url';
import { join } from 'path';

Expand All @@ -26,7 +26,10 @@ function hideFromGitIndex(uncommittedFiles: string[]) {
const options = parseArgs();

if (options.clearLocalRegistry) {
execSync('pnpm local-registry clear');
rmSync(join(__dirname, '../build/local-registry/storage'), {
recursive: true,
force: true,
});
}

const currentLatestVersion = execSync('npm view nx version')
Expand Down

0 comments on commit 68ae304

Please sign in to comment.