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.

Sign up for GitHub

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

Jump to bottom

chore: fix windows node_modules install step #21098

Merged
merged 7 commits into from
Apr 15, 2022
Merged

chore: fix windows node_modules install step #21098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b813d35
chore: fix windows build
tgriesser Apr 14, 2022
4af2962
moving this around, better logging for post-install
tgriesser Apr 14, 2022
3a5a267
fix
tgriesser Apr 14, 2022
7e12432
disable cache restore
tgriesser Apr 15, 2022
7a80203
attempt to fix windows build again
tgriesser Apr 15, 2022
3d5aa41
Put back the existing yarn stuff
tgriesser Apr 15, 2022
e4728d0
run the job on linux
tgriesser Apr 15, 2022
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
11 changes: 10 additions & 1 deletion circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ mainBuildFilters: &mainBuildFilters
- 10.0-release
- unify-1449-check-path-length-in-build

# uncomment & add to the branch conditions below to disable the main linux
# flow if we don't want to test it for a certain branch
linuxWorkflowExcludeFilters: &linux-workflow-exclude-filters
unless:
or:
- false
# - equal: [ 'tgriesser/chore/fix-windows-build', << pipeline.git.branch >> ]

# usually we don't build Mac app - it takes a long time
# but sometimes we want to really confirm we are doing the right thing
# so just add your branch to the list here to build and test on Mac
Expand All @@ -49,7 +57,7 @@ windowsWorkflowFilters: &windows-workflow-filters
or:
- equal: [ develop, << pipeline.git.branch >> ]
- equal: [ '10.0-release', << pipeline.git.branch >> ]
- equal: [ unify-1449-check-path-length-in-build, << pipeline.git.branch >> ]
- equal: [ 'tgriesser/chore/fix-windows-build', << pipeline.git.branch >> ]
- matches:
pattern: "-release$"
value: << pipeline.git.branch >>
Expand Down Expand Up @@ -2535,6 +2543,7 @@ windows-workflow: &windows-workflow
workflows:
linux:
<<: *linux-workflow
<<: *linux-workflow-exclude-filters
mac:
<<: *mac-workflow
<<: *mac-workflow-filters
Expand Down
2 changes: 2 additions & 0 deletions cli/scripts/post-install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ fs.ensureDirSync(join(__dirname, '..', 'types'))
includeTypes.forEach((folder) => {
const source = resolvePkg(`@types/${folder}`, { cwd: __dirname })

console.log(`copying ${folder} from ${source}`)

fs.copySync(source, join(__dirname, '..', 'types', folder))
})

Expand Down
3 changes: 1 addition & 2 deletions npm/webpack-dev-server-fresh/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@
"dependencies": {
"html-webpack-plugin-4": "npm:html-webpack-plugin@^4",
"html-webpack-plugin-5": "npm:html-webpack-plugin@^5",
"rimraf": "3.0.2",
"speed-measure-webpack-plugin": "1.4.2",
"tsutils": "^3.21.0",
"tslib": "^2.3.1",
"webpack-dev-server": "^4.7.4",
"webpack-merge": "^5.4.0"
},
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42009,7 +42009,7 @@ tslib@2.1.0, tslib@~2.1.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==

tslib@2.3.1, tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@~2.3.0:
tslib@2.3.1, tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@~2.3.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
Expand Down Expand Up @@ -42098,7 +42098,7 @@ tsutils@^2.29.0:
dependencies:
tslib "^1.8.1"

tsutils@^3.17.1, tsutils@^3.21.0:
tsutils@^3.17.1:
version "3.21.0"
resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
Expand Down