-
Notifications
You must be signed in to change notification settings - Fork 178
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'edge' into pick_up_tip_testing
- Loading branch information
Showing
2,448 changed files
with
194,817 additions
and
64,011 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,7 +85,7 @@ jobs: | |
make setup-js | ||
- name: 'test frontend packages' | ||
run: | | ||
yarn jest --coverage=true --ci=true --collectCoverageFrom="app/src/**/*.(js|ts|tsx)" app/src components/src shared-data/js | ||
make -C app test-cov | ||
- name: 'Upload coverage report' | ||
uses: codecov/codecov-action@v3 | ||
with: | ||
|
@@ -141,8 +141,7 @@ jobs: | |
yarn config set cache-folder ${{ github.workspace }}/.yarn-cache | ||
make setup-js | ||
- name: 'test native(er) packages' | ||
run: | | ||
yarn jest --coverage=true --ci=true --collectCoverageFrom="(app-shell|app-shell-odd| discovery-client)/src/**/*.(js|ts|tsx)" app-shell/src app-shell-odd/src discovery-client/src | ||
run: make test-js-internal tests="app-shell/src app-shell-odd/src discovery-client/src" cov_opts="--coverage=true --ci=true --collectCoverageFrom='(app-shell|app-shell-odd| discovery-client)/src/**/*.(js|ts|tsx)'" | ||
- name: 'Upload coverage report' | ||
uses: 'codecov/codecov-action@v3' | ||
with: | ||
|
@@ -181,7 +180,7 @@ jobs: | |
echo 'type=develop' >> $GITHUB_OUTPUT | ||
elif [ "${{ format('{0}', github.ref == 'refs/heads/edge') }}" = "true" ] ; then | ||
echo "both develop builds for edge" | ||
echo 'variants=["release", "internal-release"]' >> GITHUB_OUTPUT | ||
echo 'variants=["release", "internal-release"]' >> $GITHUB_OUTPUT | ||
echo 'type=develop' >> $GITHUB_OUTPUT | ||
elif [ "${{ format('{0}', endsWith(github.ref, 'app-build-internal')) }}" = "true" ] ; then | ||
echo "internal-release builds for app-build-internal suffixes" | ||
|
@@ -231,7 +230,7 @@ jobs: | |
echo "Configuring project, bucket, and folder for ot3" | ||
echo "project=ot3" >> $GITHUB_OUTPUT | ||
echo "bucket=${{env._APP_DEPLOY_BUCKET_OT3}}" >> $GITHUB_OUTPUT | ||
echo "folder=${{env._APP_DEPLOY_BUCKET_OT3}}" >> $GITHUB_OUTPUT | ||
echo "folder=${{env._APP_DEPLOY_FOLDER_OT3}}" >> $GITHUB_OUTPUT | ||
fi | ||
- uses: 'actions/checkout@v3' | ||
with: | ||
|
@@ -313,9 +312,10 @@ jobs: | |
make -C app-shell-odd dist-ot3 | ||
deploy-release-app: | ||
name: 'Deploy built release-variant app artifacts to S3' | ||
name: 'Deploy built app artifacts to S3' | ||
runs-on: 'ubuntu-22.04' | ||
needs: ['js-unit-test', 'backend-unit-test', 'build-app', 'determine-build-type'] | ||
needs: | ||
['js-unit-test', 'backend-unit-test', 'build-app', 'determine-build-type'] | ||
if: contains(fromJSON(needs.determine-build-type.outputs.variants), 'release') || contains(fromJSON(needs.determine-build-type.outputs.variants), 'internal-release') | ||
steps: | ||
- name: 'download run app builds' | ||
|
@@ -348,15 +348,19 @@ jobs: | |
- name: 'deploy internal-release release builds to s3' | ||
run: | | ||
aws s3 --profile=deploy sync --acl=public-read to_upload_internal-release/ s3://${{ env._APP_DEPLOY_BUCKET_OT3 }}/${{ env._APP_DEPLOY_FOLDER_OT3 }} | ||
- name: 'create GH release' | ||
- name: 'upload windows artifacts to GH release' | ||
uses: 'ncipollo/[email protected]' | ||
if: needs.determine-build-type.outputs.type == 'release' | ||
with: | ||
allowUpdates: true | ||
replacesArtifacts: true | ||
omitBodyDuringUpdate: true | ||
omitDraftDuringUpdate: true | ||
omitNameDuringUpdate: true | ||
omitPrereleaseDuringUpdate: true | ||
- name: 'upload windows artifact to GH release' | ||
artifacts: ./artifacts/*/*.exe | ||
artifactContentType: application/vnd.microsoft.portable-executable | ||
- name: 'upload macos artifacts to GH release' | ||
uses: 'ncipollo/[email protected]' | ||
if: needs.determine-build-type.outputs.type == 'release' | ||
with: | ||
|
@@ -365,11 +369,21 @@ jobs: | |
omitDraftDuringUpdate: true | ||
omitNameDuringUpdate: true | ||
omitPrereleaseDuringUpdate: true | ||
artifacts: ./artifacts/**/*.exe ./artifacts/**/*.dmg ./artifacts/**/*.AppImage | ||
artifactContentType: application/vnd.microsoft.portable-executable | ||
- name: 'detect internal-release build data for notification' | ||
artifacts: ./artifacts/*/*.dmg | ||
artifactContentType: application/octet-stream | ||
- name: 'upload linux artifacts to GH release' | ||
uses: 'ncipollo/[email protected]' | ||
if: needs.determine-build-type.outputs.type == 'release' | ||
with: | ||
allowUpdates: true | ||
omitBodyDuringUpdate: true | ||
omitDraftDuringUpdate: true | ||
omitNameDuringUpdate: true | ||
omitPrereleaseDuringUpdate: true | ||
artifacts: ./artifacts/*/*.AppImage | ||
artifactContentType: application/octet-stream | ||
- name: 'detect build data for notification' | ||
id: names | ||
if: contains(fromJSON(needs.determine-build-type.outputs.variants), 'internal-release') | ||
shell: bash | ||
run: | | ||
for variant in release internal-release ; do | ||
|
@@ -387,15 +401,65 @@ jobs: | |
uses: slackapi/[email protected] | ||
if: contains(fromJSON(needs.determine-build-type.outputs.variants), 'internal-release') | ||
with: | ||
payload: "{\"branch_or_tag\":\"${{ github.ref_name }}\",\"build_type\":\"${{ needs.determine-build-type.outputs.type }}\", \"gh_linkback\":\"https://github.com/Opentrons/opentrons/tree/${{ github.ref_name }}\", \"windows_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.windows-internal-release}}\", \"mac_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.mac-internal-release}}\", \"linux_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.linux-internal-release}}\"}" | ||
payload: '{"branch_or_tag":"${{ github.ref_name }}","build_type":"${{ needs.determine-build-type.outputs.type }}", "gh_linkback":"https://github.com/Opentrons/opentrons/tree/${{ github.ref_name }}", "windows_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.windows-internal-release}}", "mac_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.mac-internal-release}}", "linux_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.linux-internal-release}}"}' | ||
env: | ||
SLACK_WEBHOOK_URL: ${{ secrets.OT_APP_OT3_SLACK_NOTIFICATION_WEBHOOK_URL }} | ||
_ACCESS_URL: https://${{env._APP_DEPLOY_BUCKET_OT3}}/${{env._APP_DEPLOY_FOLDER_OT3}} | ||
- name: 'slack notify release' | ||
uses: slackapi/[email protected] | ||
if: contains(fromJSON(needs.determine-build-type.outputs.variants), 'release') | ||
with: | ||
payload: "{\"branch_or_tag\":\"${{ github.ref_name }}\",\"build_type\":\"${{ needs.determine-build-type.outputs.type }}\", \"gh_linkback\":\"https://github.com/Opentrons/opentrons/tree/${{ github.ref_name }}\", \"windows_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.windows-release}}\", \"mac_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.mac-release}}\", \"linux_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.linux-release}}\"}" | ||
payload: '{"branch_or_tag":"${{ github.ref_name }}","build_type":"${{ needs.determine-build-type.outputs.type }}", "gh_linkback":"https://github.com/Opentrons/opentrons/tree/${{ github.ref_name }}", "windows_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.windows-release}}", "mac_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.mac-release}}", "linux_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.linux-release}}"}' | ||
env: | ||
SLACK_WEBHOOK_URL: ${{ secrets.OT_APP_ROBOTSTACK_SLACK_NOTIFICATION_WEBHOOK_URL }} | ||
_ACCESS_URL: https://${{env._APP_DEPLOY_BUCKET_ROBOTSTACK}}/${{env._APP_DEPLOY_FOLDER_ROBOTSTACK}} | ||
|
||
- name: 'pull repo for scripts' | ||
uses: 'actions/checkout@v3' | ||
with: | ||
path: ./monorepo | ||
# https://github.com/actions/checkout/issues/290 | ||
- name: 'Fix actions/checkout odd handling of tags' | ||
if: startsWith(github.ref, 'refs/tags') | ||
run: | | ||
cd ./monorepo | ||
git fetch -f origin ${{ github.ref }}:${{ github.ref }} | ||
git checkout ${{ github.ref }} | ||
- uses: 'actions/setup-node@v3' | ||
with: | ||
node-version: '16' | ||
- name: 'install udev' | ||
run: sudo apt-get update && sudo apt-get install libudev-dev | ||
- name: 'set complex environment variables' | ||
id: 'set-vars' | ||
uses: actions/github-script@v6 | ||
with: | ||
script: | | ||
const { buildComplexEnvVars } = require(`${process.env.GITHUB_WORKSPACE}/monorepo/.github/workflows/utils.js`) | ||
buildComplexEnvVars(core, context) | ||
- name: 'cache yarn cache' | ||
uses: actions/cache@v3 | ||
with: | ||
path: | | ||
${{ github.workspace }}/.npm-cache/_prebuild | ||
${{ github.workspace }}/.yarn-cache | ||
key: js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }} | ||
- name: 'setup-js' | ||
run: | | ||
npm config set cache ${{ github.workspace }}/.npm-cache | ||
yarn config set cache-folder ${{ github.workspace }}/.yarn-cache | ||
cd monorepo | ||
make setup-js | ||
- name: 'update internal-releases releases.json' | ||
if: needs.determine-build-type.outputs.type == 'release' && contains(fromJSON(needs.determine-build-type.outputs.variants), 'internal-release') | ||
run: | | ||
aws --profile=deploy s3 cp s3://${{ env._APP_DEPLOY_BUCKET_OT3 }}/${{ env._APP_DEPLOY_FOLDER_OT3 }}/releases.json ./to_upload_internal-release/releases.json | ||
node ./monorepo/scripts/update-releases-json ./to_upload_internal-release/releases.json ot3 ./to_upload_internal-release https://ot3-development.builds.opentrons.com/app/ | ||
aws --profile=deploy s3 cp ./to_upload_internal-release/releases.json s3://${{ env._APP_DEPLOY_BUCKET_OT3 }}/${{ env._APP_DEPLOY_FOLDER_OT3 }}/releases.json | ||
- name: 'update release releases.json' | ||
if: needs.determine-build-type.outputs.type == 'release' && contains(fromJSON(needs.determine-build-type.outputs.variants), 'release') | ||
run: | | ||
aws --profile=deploy s3 cp s3://${{ env._APP_DEPLOY_BUCKET_ROBOTSTACK }}/${{ env._APP_DEPLOY_FOLDER_ROBOTSTACK }}/releases.json ./to_upload_release/releases.json | ||
node ./monorepo/scripts/update-releases-json ./to_upload_release/releases.json robot-stack ./to_upload_release https://builds.opentrons.com/app/ | ||
aws --profile=deploy s3 cp ./to_upload_release/releases.json s3://${{ env._APP_DEPLOY_BUCKET_ROBOTSTACK }}/${{ env._APP_DEPLOY_FOLDER_ROBOTSTACK }}/releases.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.