From 245136f14afed2a731a5ca5f9b5b071a3131961b Mon Sep 17 00:00:00 2001 From: smartcontracts Date: Fri, 28 May 2021 13:00:15 -0400 Subject: [PATCH] fix: force LF line endings for scripts to avoid docker problems on Windows (#974) * fix: use correct line endings for windows * chore: add changeset --- .changeset/thin-waves-bathe.md | 5 +++++ .gitattributes | 1 + packages/contracts/bin/deploy.ts | 2 -- packages/contracts/package.json | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 .changeset/thin-waves-bathe.md create mode 100644 .gitattributes diff --git a/.changeset/thin-waves-bathe.md b/.changeset/thin-waves-bathe.md new file mode 100644 index 000000000000..605e410ac5df --- /dev/null +++ b/.changeset/thin-waves-bathe.md @@ -0,0 +1,5 @@ +--- +'@eth-optimism/contracts': patch +--- + +Minor change to how deploy.ts is invoked diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000000..dfdb8b771ce0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sh text eol=lf diff --git a/packages/contracts/bin/deploy.ts b/packages/contracts/bin/deploy.ts index 719ac691c4fa..7ac14d6615e1 100755 --- a/packages/contracts/bin/deploy.ts +++ b/packages/contracts/bin/deploy.ts @@ -1,5 +1,3 @@ -#!/usr/bin/env ts-node-script - import { Wallet } from 'ethers' import path from 'path' import dirtree from 'directory-tree' diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 0dd1f1c288c4..e8f750f6d7a3 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -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", "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",