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

fix: force LF line endings for scripts to avoid docker problems on Windows #974

Merged
merged 3 commits into from
May 28, 2021
Merged

fix: force LF line endings for scripts to avoid docker problems on Windows #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cc41e1
fix: use correct line endings for windows
smartcontracts May 27, 2021
cd75769
chore: add changeset
smartcontracts May 28, 2021
d93a7c6
Merge branch 'develop' into kelvin/fix-windows
smartcontracts May 28, 2021
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
5 changes: 5 additions & 0 deletions .changeset/thin-waves-bathe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts': patch
---

Minor change to how deploy.ts is invoked
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.sh text eol=lf
2 changes: 0 additions & 2 deletions packages/contracts/bin/deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#!/usr/bin/env ts-node-script

import { Wallet } from 'ethers'
import path from 'path'
import dirtree from 'directory-tree'
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
"lint:check": "yarn run lint:typescript",
"lint:typescript": "tslint --format stylish --project .",
"clean": "rm -rf ./dist ./artifacts ./artifacts-ovm ./cache ./cache-ovm ./tsconfig.build.tsbuildinfo",
"deploy": "./bin/deploy.ts && yarn generate-markdown",
"deploy": "ts-node \"./bin/deploy.ts\" && yarn generate-markdown",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The big quotes are required?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ermmmm they definitely used to be required when I was working on windows a year ago. Maybe things have changed. Just being safe. We might want to do a full review of windows support later.

"serve": "./bin/serve_dump.sh",
"prepublishOnly": "yarn copyfiles -u 2 \"contracts/optimistic-ethereum/**/*\" ./",
"postpublish": "rimraf OVM iOVM libraries mockOVM",
"prepack": "yarn prepublishOnly",
"postpack": "yarn postpublish",
"generate-markdown": "node scripts/generate-markdown.js"
"generate-markdown": "node \"./scripts/generate-markdown.js\""
},
"dependencies": {
"@eth-optimism/core-utils": "^0.4.4",
Expand Down