From fdb4b31e1bc5b59b6d02f889cc09d95feb588368 Mon Sep 17 00:00:00 2001 From: wlongabaugh Date: Fri, 29 Sep 2023 10:13:10 -0700 Subject: [PATCH] Remove debug, fix dir --- .circleci/config.yml | 16 ++++++++-------- idc-deploy-shell/pull_config.sh | 6 ------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 222fc73f0c5..09b7e0b3fd4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -84,7 +84,7 @@ jobs: build_job: environment: TZ: '/usr/share/zoneinfo/America/Los_Angeles' - working_directory: ~/Viewers + working_directory: ~/ViewersV3 docker: - image: cimg/python:3.8 resource_class: large @@ -101,9 +101,9 @@ jobs: # - run: # name: Copy in IDC favicons # command: | -# cp ~/Viewers/idc-assets/favicon-nci.ico ~/ViewersV3/platform/viewer/public/assets/favicon.ico -# cp ~/Viewers/idc-assets/favicon-nci-16x16.png ~/ViewersV3/platform/viewer/public/assets/favicon-16x16.png -# cp ~/Viewers/idc-assets/favicon-nci-32x32.png ~/ViewersV3/platform/viewer/public/assets/favicon-32x32.png +# cp ~/ViewersV3/idc-assets/favicon-nci.ico ~/ViewersV3/platform/viewer/public/assets/favicon.ico +# cp ~/ViewersV3/idc-assets/favicon-nci-16x16.png ~/ViewersV3/platform/viewer/public/assets/favicon-16x16.png +# cp ~/ViewersV3/idc-assets/favicon-nci-32x32.png ~/ViewersV3/platform/viewer/public/assets/favicon-32x32.png - run: name: Build Viewer command: | @@ -114,7 +114,7 @@ jobs: ./idc-deploy-shell/killPing.sh - save_cache: - key: idc-viewer-{{ epoch }} + key: idc-viewerV3-{{ epoch }} paths: - ./platform/viewer/dist - ./idc-deploy-shell @@ -125,11 +125,11 @@ jobs: TZ: '/usr/share/zoneinfo/America/Los_Angeles' docker: - image: cimg/python:3.8 - working_directory: ~/Viewers + working_directory: ~/ViewersV3 steps: - restore_cache: keys: - - idc-viewer- + - idc-viewerV3- - install_cloud_sdk - deployment_setup - auth @@ -138,7 +138,7 @@ jobs: # name: Customize Config # command: | # /bin/bash ./idc-deploy-shell/prepare_config.sh > platform/viewer/dist/app-config.js -# cp ~/Viewers/idc-assets/IDC-Logo-WHITE.svg platform/viewer/dist/IDC-Logo-WHITE.svg +# cp ~/ViewersV3/idc-assets/IDC-Logo-WHITE.svg platform/viewer/dist/IDC-Logo-WHITE.svg - run: name: Copy to cloud command: | diff --git a/idc-deploy-shell/pull_config.sh b/idc-deploy-shell/pull_config.sh index 35f891be699..099d9c75f4b 100644 --- a/idc-deploy-shell/pull_config.sh +++ b/idc-deploy-shell/pull_config.sh @@ -1,13 +1,7 @@ #!/usr/bin/env bash if [ ! -f "/home/circleci/${CIRCLE_PROJECT_REPONAME}/viewer3_deployment_config.txt" ]; then - echo gs://${DEPLOYMENT_BUCKET}/viewer3_deployment_config.txt - ls -las /home/circleci/${CIRCLE_PROJECT_REPONAME} - gsutil ls gs://${DEPLOYMENT_BUCKET}/ - # Suddenly gsutil does not like trailing slashes as gs destinations? - echo /home/circleci/${CIRCLE_PROJECT_REPONAME} gsutil cp gs://${DEPLOYMENT_BUCKET}/viewer3_deployment_config.txt /home/circleci/${CIRCLE_PROJECT_REPONAME}/ - ls -lasR /home/circleci/${CIRCLE_PROJECT_REPONAME} chmod ugo+r /home/circleci/${CIRCLE_PROJECT_REPONAME}/viewer3_deployment_config.txt if [ ! -f "/home/circleci/${CIRCLE_PROJECT_REPONAME}/viewer3_deployment_config.txt" ]; then echo "[ERROR] Couldn't assign viewer deployment configuration file - exiting."