Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ci): 支持 Windows 环境测试 #13739

Merged
merged 15 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ permissions:

jobs:
build:

runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
node-version: [14.x, 16.x]
os: [windows-latest, ubuntu-latest]
exclude:
- os: windows-latest
node-version: 16.x

runs-on: ${{ matrix.os }}

steps:
- name: Checkout
Expand Down
Empty file modified .husky/commit-msg
100755 → 100644
Empty file.
Empty file modified .husky/pre-commit
100755 → 100644
Empty file.
Empty file modified packages/create-app/src/createApp.ts
100755 → 100644
Empty file.
Empty file modified packages/create-app/src/index.ts
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion packages/jest-helper/src/sequencer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Test } from 'jest-runner'
const Sequencer = require('@jest/test-sequencer').default

export default class CustomSequencer extends Sequencer {
sort(tests: Test[]) {
sort (tests: Test[]) {
const copyTests = Array.from(tests)
return copyTests.sort((testA, testB) => testA.path.localeCompare(testB.path))
}
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-helper/src/snapshot/serializers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const snapshotObject2String = (val: Record<string, string>) => {
}

export const serialize = (
val: any
val: any,
// config: Config,
// indentation: string,
// depth: number,
Expand Down
Empty file modified packages/taro-cli-convertor/bin/taro-convert
100755 → 100644
Empty file.
1 change: 1 addition & 0 deletions packages/taro-cli/bin/taro
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
require('../dist/util').printPkgVersion()

const CLI = require('../dist/cli').default

new CLI().run()
Empty file modified packages/taro-components/src/utils/index.ts
100755 → 100644
Empty file.
Empty file.
1 change: 1 addition & 0 deletions packages/taro-mini-runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
"babel-jest": "^29.5.0",
"jest": "^29.3.1",
"jest-cli": "^29.3.1",
"jest-taro-helper": "workspace:*",
"jest-transform-css": "^6.0.1",
"jest-environment-node": "^29.5.0",
"jest-taro-helper": "workspace:*",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as fs from 'fs-extra'
import { fs } from '@tarojs/helper'
import * as path from 'path'

let compile
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as fs from 'fs-extra'
import { fs } from '@tarojs/helper'

import { detailMock, indexMock } from './fixtures/prerender/vmMock'

Expand Down