diff --git a/.circleci/config.yml b/.circleci/config.yml index 44d17f1be..bbc40e693 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -179,6 +179,9 @@ jobs: root: ~/repo paths: - platform/app/dist + - version.txt + - commit.txt + - version.json - netlify.toml - .netlify @@ -281,9 +284,13 @@ jobs: command: | node ./increaseEventEmitterLimit.mjs - run: - name: build all packages + name: build half of the packages command: | yarn run build:package-all + - run: + name: build the other half of the packages + command: | + yarn run build:package-all-1 - run: name: version and publish all packages command: | @@ -301,13 +308,13 @@ jobs: command: | # This file will exist if a new version was published by # our command in the previous job. - if [[ ! -e ../version.txt ]]; then + if [[ ! -e version.txt ]]; then exit 0 else # Remove npm config rm -f ./.npmrc # Set our version number using vars - export IMAGE_VERSION=$(cat ../version.txt) + export IMAGE_VERSION=$(cat version.txt) export IMAGE_VERSION_FULL=v$IMAGE_VERSION echo $IMAGE_VERSION echo $IMAGE_VERSION_FULL @@ -333,14 +340,14 @@ jobs: # This file will exist if a new version was published by # our command in the previous job. - if [[ ! -e ../version.txt ]]; then + if [[ ! -e version.txt ]]; then echo "don't have version txt" exit 0 else echo "Building and pushing Docker image from the master branch (beta releases)" rm -f ./.npmrc # Set our version number using vars - export IMAGE_VERSION=$(cat ../version.txt) + export IMAGE_VERSION=$(cat version.txt) export IMAGE_VERSION_FULL=v$IMAGE_VERSION echo $IMAGE_VERSION echo $IMAGE_VERSION_FULL diff --git a/extensions/cornerstone-dicom-rt/package.json b/extensions/cornerstone-dicom-rt/package.json index 5dbd6e621..850f1c497 100644 --- a/extensions/cornerstone-dicom-rt/package.json +++ b/extensions/cornerstone-dicom-rt/package.json @@ -27,7 +27,7 @@ "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo", "dev:dicom-seg": "yarn run dev", "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js", - "build:package": "yarn run build", + "build:package-1": "yarn run build", "start": "yarn run dev" }, "peerDependencies": { diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json index e806f05bd..a25fd2aa6 100644 --- a/extensions/cornerstone-dicom-seg/package.json +++ b/extensions/cornerstone-dicom-seg/package.json @@ -27,7 +27,7 @@ "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo", "dev:dicom-seg": "yarn run dev", "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js", - "build:package": "yarn run build", + "build:package-1": "yarn run build", "start": "yarn run dev" }, "peerDependencies": { diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json index 3b3e860cd..344456af3 100644 --- a/extensions/cornerstone-dicom-sr/package.json +++ b/extensions/cornerstone-dicom-sr/package.json @@ -26,7 +26,7 @@ "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo", "dev:cornerstone": "yarn run dev", "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js", - "build:package": "yarn run build", + "build:package-1": "yarn run build", "start": "yarn run dev", "test:unit": "jest --watchAll", "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests" diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index 50a53c0ea..5b313c48a 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -28,7 +28,7 @@ "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo", "dev:cornerstone": "yarn run dev", "build": "cross-env NODE_ENV=production webpack --progress --config .webpack/webpack.prod.js", - "build:package": "yarn run build", + "build:package-1": "yarn run build", "start": "yarn run dev" }, "peerDependencies": { diff --git a/extensions/default/package.json b/extensions/default/package.json index 462942e53..a37e6d9c3 100644 --- a/extensions/default/package.json +++ b/extensions/default/package.json @@ -26,7 +26,7 @@ "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo", "dev:dicom-pdf": "yarn run dev", "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js", - "build:package": "yarn run build", + "build:package-1": "yarn run build", "start": "yarn run dev" }, "peerDependencies": { diff --git a/extensions/dicom-microscopy/package.json b/extensions/dicom-microscopy/package.json index 8788591ed..829a7bc2e 100644 --- a/extensions/dicom-microscopy/package.json +++ b/extensions/dicom-microscopy/package.json @@ -24,7 +24,7 @@ "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo", "dev:dicom-pdf": "yarn run dev", "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js", - "build:package": "yarn run build", + "build:package-1": "yarn run build", "start": "yarn run dev" }, "peerDependencies": { diff --git a/extensions/dicom-pdf/package.json b/extensions/dicom-pdf/package.json index 4e6789f03..087454ab0 100644 --- a/extensions/dicom-pdf/package.json +++ b/extensions/dicom-pdf/package.json @@ -22,7 +22,7 @@ "scripts": { "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo", "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js", - "build:package": "yarn run build", + "build:package-1": "yarn run build", "start": "yarn run dev", "test:unit": "jest --watchAll", "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests" diff --git a/extensions/dicom-video/package.json b/extensions/dicom-video/package.json index 358d55c69..ee155bbd3 100644 --- a/extensions/dicom-video/package.json +++ b/extensions/dicom-video/package.json @@ -22,7 +22,7 @@ "scripts": { "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo", "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js", - "build:package": "yarn run build", + "build:package-1": "yarn run build", "start": "yarn run dev", "test:unit": "jest --watchAll", "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests" diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json index 250dd587a..597c5c2ac 100644 --- a/extensions/measurement-tracking/package.json +++ b/extensions/measurement-tracking/package.json @@ -26,7 +26,7 @@ "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo", "dev:dicom-pdf": "yarn run dev", "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js", - "build:package": "yarn run build", + "build:package-1": "yarn run build", "start": "yarn run dev" }, "peerDependencies": { diff --git a/extensions/test-extension/package.json b/extensions/test-extension/package.json index 247d48034..001939ab1 100644 --- a/extensions/test-extension/package.json +++ b/extensions/test-extension/package.json @@ -22,7 +22,7 @@ "scripts": { "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo", "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js", - "build:package": "yarn run build", + "build:package-1": "yarn run build", "start": "yarn run dev", "test:unit": "jest --watchAll", "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests" diff --git a/modes/microscopy/package.json b/modes/microscopy/package.json index 5080cfeb8..8429d8c4d 100644 --- a/modes/microscopy/package.json +++ b/modes/microscopy/package.json @@ -14,7 +14,7 @@ "keywords": [ "ohif-mode" ], - "publishConfig": { + "publishConfig": { "access": "public" }, "module": "src/index.tsx", diff --git a/package.json b/package.json index 350c7d488..ba4c5d728 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "build:ui:deploy-preview": "lerna run build:ui:deploy-preview --stream", "build:demo": "lerna run build:viewer:demo --stream", "build:package-all": "lerna run build:package --parallel --stream", + "build:package-all-1": "lerna run build:package-1 --parallel --stream", "dev": "lerna run dev:viewer --stream", "dev:project": ".scripts/dev.sh", "dev:orthanc": "lerna run dev:orthanc --stream",