aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-08-27 20:09:11 +0800
committerGitHub <noreply@github.com>2018-08-27 20:09:11 +0800
commit368dbda8f0e85105f5fabba166962ee3f9616f5c (patch)
treed10e54538f509c9ba7b9cc27cf01780cf3bce99b
parent77290c1efaa8a9e3ded93a4aea4849c16138e457 (diff)
parentbc4149683e2dda2b36c29cc81fadf1ae4de7d8b1 (diff)
downloaddexon-sol-tools-368dbda8f0e85105f5fabba166962ee3f9616f5c.tar
dexon-sol-tools-368dbda8f0e85105f5fabba166962ee3f9616f5c.tar.gz
dexon-sol-tools-368dbda8f0e85105f5fabba166962ee3f9616f5c.tar.bz2
dexon-sol-tools-368dbda8f0e85105f5fabba166962ee3f9616f5c.tar.lz
dexon-sol-tools-368dbda8f0e85105f5fabba166962ee3f9616f5c.tar.xz
dexon-sol-tools-368dbda8f0e85105f5fabba166962ee3f9616f5c.tar.zst
dexon-sol-tools-368dbda8f0e85105f5fabba166962ee3f9616f5c.zip
Merge pull request #1028 from 0xProject/fix-ci
Fix `test_publish` CI Test
-rw-r--r--packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts11
-rw-r--r--packages/monorepo-scripts/src/publish.ts8
-rw-r--r--packages/monorepo-scripts/src/test_installation.ts2
-rw-r--r--packages/monorepo-scripts/src/utils/changelog_utils.ts5
-rw-r--r--packages/sra-spec/src/md/index.ts2
5 files changed, 16 insertions, 12 deletions
diff --git a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
index 490a6c50a..ba36afea1 100644
--- a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
+++ b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
@@ -1,7 +1,14 @@
import { AbiDecoder, intervalUtils, logUtils } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import { ContractArtifact } from 'ethereum-types';
-import { BlockParamLiteral, ContractAbi, FilterObject, LogEntry, LogWithDecodedArgs, RawLog } from 'ethereum-types';
+import {
+ BlockParamLiteral,
+ ContractAbi,
+ ContractArtifact,
+ FilterObject,
+ LogEntry,
+ LogWithDecodedArgs,
+ RawLog,
+} from 'ethereum-types';
import { Block, BlockAndLogStreamer, Log } from 'ethereumjs-blockstream';
import * as _ from 'lodash';
diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts
index 7e2e64536..646818c58 100644
--- a/packages/monorepo-scripts/src/publish.ts
+++ b/packages/monorepo-scripts/src/publish.ts
@@ -74,9 +74,11 @@ async function confirmAsync(message: string): Promise<void> {
});
utils.log(`Calling 'lerna publish'...`);
await lernaPublishAsync(packageToNextVersion);
- const isStaging = false;
- const shouldUploadDocs = !configs.IS_LOCAL_PUBLISH;
- await generateAndUploadDocJsonsAsync(packagesWithDocs, isStaging, shouldUploadDocs);
+ if (!configs.IS_LOCAL_PUBLISH) {
+ const isStaging = false;
+ const shouldUploadDocs = true;
+ await generateAndUploadDocJsonsAsync(packagesWithDocs, isStaging, shouldUploadDocs);
+ }
const isDryRun = configs.IS_LOCAL_PUBLISH;
await publishReleaseNotesAsync(updatedPublicPackages, isDryRun);
})().catch(err => {
diff --git a/packages/monorepo-scripts/src/test_installation.ts b/packages/monorepo-scripts/src/test_installation.ts
index 10709af25..be39b1878 100644
--- a/packages/monorepo-scripts/src/test_installation.ts
+++ b/packages/monorepo-scripts/src/test_installation.ts
@@ -146,7 +146,7 @@ async function testInstallPackageAsync(
const transpiledIndexFilePath = path.join(testDirectory, 'index.js');
utils.log(`Running test script with ${packageName} imported`);
await execAsync(`node ${transpiledIndexFilePath}`);
- utils.log(`Successfilly ran test script with ${packageName} imported`);
+ utils.log(`Successfully ran test script with ${packageName} imported`);
}
await rimrafAsync(testDirectory);
}
diff --git a/packages/monorepo-scripts/src/utils/changelog_utils.ts b/packages/monorepo-scripts/src/utils/changelog_utils.ts
index 4781b3b7d..8058d222b 100644
--- a/packages/monorepo-scripts/src/utils/changelog_utils.ts
+++ b/packages/monorepo-scripts/src/utils/changelog_utils.ts
@@ -19,11 +19,6 @@ CHANGELOG
export const changelogUtils = {
getChangelogMdTitle(versionChangelog: VersionChangelog): string {
- if (_.isUndefined(versionChangelog.timestamp)) {
- throw new Error(
- 'All CHANGELOG.json entries must be updated to include a timestamp before generating their MD version',
- );
- }
const date = moment(`${versionChangelog.timestamp}`, 'X').format('MMMM D, YYYY');
const title = `\n## v${versionChangelog.version} - _${date}_\n\n`;
return title;
diff --git a/packages/sra-spec/src/md/index.ts b/packages/sra-spec/src/md/index.ts
index 0d1147aa0..4e778e073 100644
--- a/packages/sra-spec/src/md/index.ts
+++ b/packages/sra-spec/src/md/index.ts
@@ -1,5 +1,5 @@
import { readFileSync } from 'fs';
export const md = {
- introduction: readFileSync('lib/md/introduction.md').toString(),
+ introduction: readFileSync(`${__dirname}/introduction.md`).toString(),
};