From 7ca92ab25f52e75e7e20cb1b433cc993c9acec19 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Feb 2023 17:12:51 +0000 Subject: [PATCH 01/81] Made changes to deploy script --- .build_scripts/deploy.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index 9afa680c8..d966244d2 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -2,11 +2,11 @@ set -e # halt script on error # If this is the deploy branch, push it up to gh-pages -if [ $TRAVIS_PULL_REQUEST = "false" ] && [ $TRAVIS_BRANCH = ${DEPLOY_BRANCH} ]; then +if [ $CIRCLE_PULL_REQUEST = "false" ] && [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then echo "Get ready, we're pushing to gh-pages!" - git config user.name "Travis-CI" - git config user.email "travis@somewhere.com" - node_modules/.bin/gh-pages -x -d _site -b gh-pages -r "https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git" + git config user.name "CIRCLECI" + git config user.email "circleci@somewhere.com" + node_modules/.bin/gh-pages -x -d _site -b gh-pages -r "https://${GH_TOKEN}@github.com/${CIRCLE_REPOSITORY_URL}.git" else echo "Not a publishable branch so we're all done here" fi From 07d56dbeedced99e3bc56ef317252cb34fb6bfea Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 15 Feb 2023 13:52:25 +0000 Subject: [PATCH 02/81] Adding the config.yml for CircleCI --- .circleci/config.yml | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..6c6cf3de6 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,51 @@ +defaults: &defaults + working_directory: ~/repo + + version: 2 + build: + jobs: + build: + <<: *defaults + docker: + - image: circleci/ruby:2.7 + + jobs: + build: + working_directory: ~/repo + steps: + run: + name: before_install + command: 'chmod +x ./.build_scripts/deploy.sh' + run: + name: before_script + command: | + . $HOME/.nvm/nvm.sh + nvm install $TRAVIS_NODE_VERSION + nvm use $TRAVIS_NODE_VERSION + npm install + run: + name: script + command: npm run build-prod + + deploy: + steps: + run: + name: deploy + requires: script + skip_cleanup: true + script: ".build_scripts/deploy.sh" + filters: + branches: + only: "${DEPLOY_BRANCH}" + + workflows: + version: 2 + test_deploy: + jobs: + - build + - deploy + requires: + - build + filters: + branches: + only: ${DEPLOY_BRANCH} \ No newline at end of file From 1a71be3904667859fce717122a35bacd11cbd65b Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 16 Feb 2023 11:34:57 +0000 Subject: [PATCH 03/81] Fixed errors and attached workspace --- .circleci/config.yml | 78 +++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c6cf3de6..d2bac205c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,51 +1,49 @@ defaults: &defaults working_directory: ~/repo +version: 2.1 - version: 2 +jobs: build: - jobs: - build: - <<: *defaults - docker: - - image: circleci/ruby:2.7 - - jobs: - build: - working_directory: ~/repo + docker: + - image: circleci/ruby:2.7 steps: - run: - name: before_install - command: 'chmod +x ./.build_scripts/deploy.sh' - run: - name: before_script - command: | - . $HOME/.nvm/nvm.sh - nvm install $TRAVIS_NODE_VERSION - nvm use $TRAVIS_NODE_VERSION - npm install - run: - name: script - command: npm run build-prod + - run: + name: before_install + command: 'chmod +x ./.build_scripts/deploy.sh' + - run: + name: before_script + command: | + . $HOME/.nvm/nvm.sh + nvm install $TRAVIS_NODE_VERSION + nvm use $TRAVIS_NODE_VERSION + npm install + - run: + name: script + command: npm run build-prod > workspace/run-build + - persist_to_workspace: + root: workspace + paths: + - run-build + deploy: + docker: + - image: circleci/ruby:2.7 steps: - run: - name: deploy - requires: script - skip_cleanup: true - script: ".build_scripts/deploy.sh" - filters: - branches: - only: "${DEPLOY_BRANCH}" + - attach_workspace: + at: /tmp/workspace + - run: + name: deploy + command: ".build_scripts/deploy.sh" - workflows: - version: 2 - test_deploy: - jobs: - - build - - deploy +workflows: + version: 2 + test_deploy: + jobs: + - build + - deploy: requires: - build - filters: - branches: - only: ${DEPLOY_BRANCH} \ No newline at end of file + filters: + branches: + only: ${DEPLOY_BRANCH} \ No newline at end of file From a3ddc41e7382b8dcde91448be54cebfd2db06ad1 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 16 Feb 2023 11:44:19 +0000 Subject: [PATCH 04/81] Fixed errors for workspace path --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d2bac205c..e06021400 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,9 +19,9 @@ jobs: npm install - run: name: script - command: npm run build-prod > workspace/run-build + command: npm run build-prod > ~/repo/run-build - persist_to_workspace: - root: workspace + root: ~/repo paths: - run-build @@ -31,7 +31,7 @@ jobs: - image: circleci/ruby:2.7 steps: - attach_workspace: - at: /tmp/workspace + at: ~/repo/run-build - run: name: deploy command: ".build_scripts/deploy.sh" From 029c1e8e8178691cc8be55f81425ecd309aee979 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 16 Feb 2023 12:34:03 +0000 Subject: [PATCH 05/81] Trying out a new script since script fails --- .circleci/config.yml | 67 +++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 41 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e06021400..239223bb2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,49 +1,34 @@ -defaults: &defaults - working_directory: ~/repo version: 2.1 - +workflows: + version: 2 + gh-pages-build: + jobs: + - build-site: + filters: + branches: + only: update/travis-to-circle-ci + - deploy-site: + filters: + branches: + only: update/travis-to-circle-ci jobs: - build: + build-site: docker: - - image: circleci/ruby:2.7 + - image: cimg/node:lts steps: + - checkout + - setup_remote_docker - run: - name: before_install - command: 'chmod +x ./.build_scripts/deploy.sh' - - run: - name: before_script command: | - . $HOME/.nvm/nvm.sh - nvm install $TRAVIS_NODE_VERSION - nvm use $TRAVIS_NODE_VERSION - npm install - - run: - name: script - command: npm run build-prod > ~/repo/run-build - - persist_to_workspace: - root: ~/repo - paths: - - run-build - - - deploy: + echo "Hello, World" + npm install + npm run build-prod + deploy-site: docker: - - image: circleci/ruby:2.7 + - image: cimg/node:lts steps: - - attach_workspace: - at: ~/repo/run-build - - run: - name: deploy - command: ".build_scripts/deploy.sh" - -workflows: - version: 2 - test_deploy: - jobs: - - build - - deploy: - requires: - - build - filters: - branches: - only: ${DEPLOY_BRANCH} \ No newline at end of file + - checkout + - setup_remote_docker + - run: + command: | + echo "Deployment Step" \ No newline at end of file From 3c88e1e1f3bb6e0386c9b2db639d4649ede0f592 Mon Sep 17 00:00:00 2001 From: Yogesh <230743+eternaltyro@users.noreply.github.com> Date: Thu, 16 Feb 2023 12:43:38 +0000 Subject: [PATCH 06/81] Updated config.yml --- .circleci/config.yml | 47 +++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 239223bb2..f40991508 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,34 +1,23 @@ version: 2.1 -workflows: - version: 2 - gh-pages-build: - jobs: - - build-site: - filters: - branches: - only: update/travis-to-circle-ci - - deploy-site: - filters: - branches: - only: update/travis-to-circle-ci -jobs: - build-site: - docker: - - image: cimg/node:lts - steps: - - checkout - - setup_remote_docker - - run: - command: | - echo "Hello, World" - npm install - npm run build-prod - deploy-site: +executors: + mm-default-executor: docker: - image: cimg/node:lts + auth: + # ensure you have first added these secrets + # visit app.circleci.com/settings/project/github/MissingMaps/partners/environment-variables + username: $DOCKER_HUB_USER + password: $DOCKER_HUB_PASSWORD +jobs: + simple-echo: + + executor: mm-default-executor steps: - checkout - - setup_remote_docker - - run: - command: | - echo "Deployment Step" \ No newline at end of file + - run: | + echo Hello, World! + +workflows: + my-custom-workflow: + jobs: + - simple-echo From a4840aca35539f8964b28ab61586667f6a1909f7 Mon Sep 17 00:00:00 2001 From: DK Benjamin Date: Wed, 22 Feb 2023 14:44:06 -0500 Subject: [PATCH 07/81] Updated config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index f40991508..1796054c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,6 +18,7 @@ jobs: echo Hello, World! workflows: + version: 2 my-custom-workflow: jobs: - simple-echo From ea60e35c2d43feba48c581ccf8dc6943a1482fae Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 1 Mar 2023 14:25:08 +0000 Subject: [PATCH 08/81] Trying out empty config file. --- .circleci/config.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1796054c3..e69de29bb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,24 +0,0 @@ -version: 2.1 -executors: - mm-default-executor: - docker: - - image: cimg/node:lts - auth: - # ensure you have first added these secrets - # visit app.circleci.com/settings/project/github/MissingMaps/partners/environment-variables - username: $DOCKER_HUB_USER - password: $DOCKER_HUB_PASSWORD -jobs: - simple-echo: - - executor: mm-default-executor - steps: - - checkout - - run: | - echo Hello, World! - -workflows: - version: 2 - my-custom-workflow: - jobs: - - simple-echo From 7ded219da496db78ebfe1474821765873dfa5347 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 1 Mar 2023 14:28:46 +0000 Subject: [PATCH 09/81] Trying out a sample config file. --- .circleci/config.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e69de29bb..d0d2fdda9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -0,0 +1,29 @@ +version: 2.1 + +# Define the jobs we want to run for this project +jobs: + build: + docker: + - image: cimg/: + auth: + username: mydockerhub-user + password: $DOCKERHUB_PASSWORD # context / project UI env-var reference + steps: + - checkout + - run: echo "this is the build job" + test: + docker: + - image: cimg/: + auth: + username: mydockerhub-user + password: $DOCKERHUB_PASSWORD # context / project UI env-var reference + steps: + - checkout + - run: echo "this is the test job" + +# Orchestrate our job run sequence +workflows: + build_and_test: + jobs: + - build + - test From 0e7377ec81e430ce1df9f28f2a669f9fdf257f81 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 1 Mar 2023 14:32:15 +0000 Subject: [PATCH 10/81] Trying out a sample config file. --- .circleci/config.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d0d2fdda9..17ed8337b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,27 +3,12 @@ version: 2.1 # Define the jobs we want to run for this project jobs: build: - docker: - - image: cimg/: - auth: - username: mydockerhub-user - password: $DOCKERHUB_PASSWORD # context / project UI env-var reference steps: - checkout - run: echo "this is the build job" - test: - docker: - - image: cimg/: - auth: - username: mydockerhub-user - password: $DOCKERHUB_PASSWORD # context / project UI env-var reference - steps: - - checkout - - run: echo "this is the test job" # Orchestrate our job run sequence workflows: build_and_test: jobs: - build - - test From aad4501a9e82702630fdb05df74fc94e6aa8d07b Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 1 Mar 2023 14:35:21 +0000 Subject: [PATCH 11/81] Trying out a sample config file. --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 17ed8337b..10a4222e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,6 +3,9 @@ version: 2.1 # Define the jobs we want to run for this project jobs: build: + docker: + # Primary container image where all steps run. + - image: cimg/base:current steps: - checkout - run: echo "this is the build job" From 75779ca116198623cf7c84d1d62d195d1a3f59eb Mon Sep 17 00:00:00 2001 From: DK Benjamin Date: Thu, 2 Mar 2023 11:37:09 -0500 Subject: [PATCH 12/81] Create skeleton for steps --- .circleci/config.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 10a4222e7..ef106aec2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,16 +2,22 @@ version: 2.1 # Define the jobs we want to run for this project jobs: - build: + build-deploy: docker: # Primary container image where all steps run. - - image: cimg/base:current + - image: ruby-2.7.4 steps: - checkout - - run: echo "this is the build job" + - build_node_v8_nvm + - install_dependencies ## install , git, g++, any other deps needed + - chmod run_deploy_script + - npm install + - npm run build-prod + - run_deploy_script # Orchestrate our job run sequence workflows: - build_and_test: + version: 2 + build_and_deploy: jobs: - - build + - build-deploy From 289e2c55e6fe40c03df1f1693b670a904f91dbba Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 8 Mar 2023 22:21:59 +0000 Subject: [PATCH 13/81] Defined jobs in the config file --- .circleci/config.yml | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef106aec2..a461ec9dc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,20 +1,36 @@ version: 2.1 - # Define the jobs we want to run for this project jobs: build-deploy: docker: # Primary container image where all steps run. - image: ruby-2.7.4 + environment: + NODE_VERSION: 8.1.2 steps: - checkout - - build_node_v8_nvm - - install_dependencies ## install , git, g++, any other deps needed - - chmod run_deploy_script - - npm install - - npm run build-prod - - run_deploy_script - + - run: + name: Build Node v8 nvm + command: nvm install v8.1.2 + - run: + name: Install dependencies + command: | + sudo apt-get update + sudo apt-get install git + sudo apt install g++ + - run: + name: Before install + command: chmod +x ./.build_scripts/deploy.sh + - run: + name: Before script + command: | + . $HOME/.nvm/nvm.sh + nvm install $NODE_VERSION + nvm use $NODE_VERSION + npm install + - run: + name: Run Build + command: npm run build-prod # Orchestrate our job run sequence workflows: version: 2 From 6e9eedd2b7cf744bcdbfe3af4788b37e25e1bcfb Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 12:41:00 +0000 Subject: [PATCH 14/81] Modified Ruby image in the config file --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a461ec9dc..99875a442 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: build-deploy: docker: # Primary container image where all steps run. - - image: ruby-2.7.4 + - image: cimg/ruby-2.7.6 environment: NODE_VERSION: 8.1.2 steps: From 5d2c5664d31522ec9e9041f7992bf3bdb0331dff Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 14:05:49 +0000 Subject: [PATCH 15/81] Modified Ruby-node image in the config --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 99875a442..a6e9d9480 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,11 +4,11 @@ jobs: build-deploy: docker: # Primary container image where all steps run. - - image: cimg/ruby-2.7.6 - environment: - NODE_VERSION: 8.1.2 + - image: cimg/ruby-2.7.5-node steps: - checkout + - run: ruby --version + - run: node --version - run: name: Build Node v8 nvm command: nvm install v8.1.2 From 7bc9d513a88a9f62975c4c3c25a97acb856504df Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 14:21:18 +0000 Subject: [PATCH 16/81] Added auth to the Ruby-Node image in the config --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6e9d9480..6ef48a655 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,6 +5,9 @@ jobs: docker: # Primary container image where all steps run. - image: cimg/ruby-2.7.5-node + auth: + username: $DOCKER_HUB_USER + password: $DOCKER_HUB_PASSWORD steps: - checkout - run: ruby --version From da7aee2dc5b6e55f87fdfb859d1350e45800f50d Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 14:38:31 +0000 Subject: [PATCH 17/81] Fixed indentation in config --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ef48a655..d17c995e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,9 +5,9 @@ jobs: docker: # Primary container image where all steps run. - image: cimg/ruby-2.7.5-node - auth: - username: $DOCKER_HUB_USER - password: $DOCKER_HUB_PASSWORD + auth: + username: $DOCKER_HUB_USER + password: $DOCKER_HUB_PASSWORD steps: - checkout - run: ruby --version From 783e49cfbdbda3ee4a4c8a477e5989644f0da371 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 15:20:14 +0000 Subject: [PATCH 18/81] Fixed image typo in config --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d17c995e9..66af70953 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: build-deploy: docker: # Primary container image where all steps run. - - image: cimg/ruby-2.7.5-node + - image: cimg/ruby:2.7.5-node auth: username: $DOCKER_HUB_USER password: $DOCKER_HUB_PASSWORD From e143701050006018c42827ba611e48606dc4cea0 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 15:55:06 +0000 Subject: [PATCH 19/81] Adding installation for nvm --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 66af70953..9e4d771e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,6 +12,9 @@ jobs: - checkout - run: ruby --version - run: node --version + -run: + name: Install nvm + command: curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash - run: name: Build Node v8 nvm command: nvm install v8.1.2 From 2ad606c8c3973b36c537c13b72809f8d0b179ee5 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 15:56:13 +0000 Subject: [PATCH 20/81] Adding installation for nvm --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9e4d771e0..0823325e4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: - checkout - run: ruby --version - run: node --version - -run: + - run: name: Install nvm command: curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash - run: From c9c20d923b61ccc2cac7c95ac9e8b733cd5d9c94 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 15:58:44 +0000 Subject: [PATCH 21/81] Adding export for nvm --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0823325e4..498c711ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,11 @@ jobs: - run: node --version - run: name: Install nvm - command: curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash + command: | + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + - run: name: Build Node v8 nvm command: nvm install v8.1.2 From 8af140af659307daa0f69a8a26459b1653c6e348 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 16:00:49 +0000 Subject: [PATCH 22/81] Adding installation for nvm --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 498c711ad..f6836d6cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,8 +17,6 @@ jobs: command: | curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - - run: name: Build Node v8 nvm command: nvm install v8.1.2 From e54f84bb5f7f63aee0ed0824376130eaa11889db Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 16:06:21 +0000 Subject: [PATCH 23/81] Output nvm to bash env --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f6836d6cd..0692eea5a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,8 @@ jobs: name: Install nvm command: | curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash - export NVM_DIR="$HOME/.nvm" + echo 'export NVM_DIR=$HOME/.nvm' >> $BASH_ENV + echo 'source $NVM_DIR/nvm.sh' >> $BASH_ENV - run: name: Build Node v8 nvm command: nvm install v8.1.2 From ce830513f60054ae8d8cdfa39ccad6639bdb972e Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 16:14:23 +0000 Subject: [PATCH 24/81] Output nvm to bash env --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0692eea5a..67438597d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ jobs: command: | curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash echo 'export NVM_DIR=$HOME/.nvm' >> $BASH_ENV - echo 'source $NVM_DIR/nvm.sh' >> $BASH_ENV + echo 'source ${NVM_DIR}/nvm.sh' --install >> $BASH_ENV - run: name: Build Node v8 nvm command: nvm install v8.1.2 From e6ad833591d1ccd5f47816af15f4263b807e9e6a Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 16:24:38 +0000 Subject: [PATCH 25/81] Changed Ruby version in Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b7df13bbd..c529e9cb0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -ruby "2.7.4" +ruby "2.7.5" source 'https://rubygems.org' gem 'jekyll', '~>3.3.0' From 4747dadde14017abf8a332bb41bd672834a36740 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 16:40:55 +0000 Subject: [PATCH 26/81] Specified Circle CI branch and repo url --- .build_scripts/deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index d966244d2..d2ef1fcd1 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -2,11 +2,11 @@ set -e # halt script on error # If this is the deploy branch, push it up to gh-pages -if [ $CIRCLE_PULL_REQUEST = "false" ] && [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then +if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then echo "Get ready, we're pushing to gh-pages!" git config user.name "CIRCLECI" git config user.email "circleci@somewhere.com" - node_modules/.bin/gh-pages -x -d _site -b gh-pages -r "https://${GH_TOKEN}@github.com/${CIRCLE_REPOSITORY_URL}.git" + node_modules/.bin/gh-pages -x -d _site -b gh-pages -r $CIRCLE_REPOSITORY_URL else echo "Not a publishable branch so we're all done here" fi From 8ec79c0d826a18b6b3047725bc45979d4ec60aac Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 13 Feb 2023 09:04:01 +0100 Subject: [PATCH 27/81] HL removed 14077, added 14064 --- app/_partner/hoganlovells.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/_partner/hoganlovells.md b/app/_partner/hoganlovells.md index 743cbc3c4..f37a7e269 100644 --- a/app/_partner/hoganlovells.md +++ b/app/_partner/hoganlovells.md @@ -46,7 +46,7 @@ subhashtags: - hoganlovellssa tm-projects: - - id: 14077 + - id: 14064 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14054 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." From 51111018742547361f7f2f37997e59fa0392265e Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 13 Feb 2023 09:10:51 +0100 Subject: [PATCH 28/81] ACTHOT removed 14060, 12308, added 14065, 14066 --- app/_partner/acthot.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index 6a75c63b0..c8fe9085c 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -16,12 +16,8 @@ subhashtags: - acthotpilot21 tm-projects: - - id: 12308 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 12311 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14060 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14055 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14056 @@ -32,5 +28,9 @@ tm-projects: desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14063 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14065 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14066 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 1e26b3e3d0925ad0edfcf971063509eaeb137336 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Tue, 14 Feb 2023 06:54:53 +0100 Subject: [PATCH 29/81] AWS removed 14020, added 14067 --- app/_partner/aws.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/_partner/aws.md b/app/_partner/aws.md index 30e48d148..1701b9480 100644 --- a/app/_partner/aws.md +++ b/app/_partner/aws.md @@ -46,7 +46,7 @@ subhashtags: tm-projects: - id: 13417 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14020 + - id: 14067 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14047 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." From 475a020dbb0391356d59d7e147f1f0c53c86892a Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Tue, 14 Feb 2023 07:00:33 +0100 Subject: [PATCH 30/81] ACTHOT r 14055, 14056, 14057, added 14082 --- app/_partner/acthot.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index c8fe9085c..d293e7552 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -18,12 +18,6 @@ subhashtags: tm-projects: - id: 12311 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14055 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14056 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14057 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14034 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14063 @@ -32,5 +26,7 @@ tm-projects: desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14066 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14082 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 017ca8f9e14ff1c85eb401796af10687d36be838 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Tue, 14 Feb 2023 08:55:26 +0100 Subject: [PATCH 31/81] ACTHOT removed 14034, added 14083 --- app/_partner/acthot.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index d293e7552..79b931ded 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -18,8 +18,6 @@ subhashtags: tm-projects: - id: 12311 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14034 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14063 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14065 @@ -28,5 +26,7 @@ tm-projects: desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14082 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14083 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From c6c1602794770531e43f7ea894702259d62ea315 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 20 Feb 2023 09:45:18 +0100 Subject: [PATCH 32/81] HL removed 13796, added 14084 --- app/_partner/hoganlovells.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/_partner/hoganlovells.md b/app/_partner/hoganlovells.md index f37a7e269..bf4115eec 100644 --- a/app/_partner/hoganlovells.md +++ b/app/_partner/hoganlovells.md @@ -50,7 +50,7 @@ tm-projects: desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14054 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 13796 + - id: 14084 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13962 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." From e85b51ed16bc190d82a1bdb22bf033f5aff329a7 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 20 Feb 2023 09:48:46 +0100 Subject: [PATCH 33/81] AWS removed 14047, added 14085 --- app/_partner/aws.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/_partner/aws.md b/app/_partner/aws.md index 1701b9480..921acdb19 100644 --- a/app/_partner/aws.md +++ b/app/_partner/aws.md @@ -48,7 +48,7 @@ tm-projects: desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14067 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14047 + - id: 14085 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14037 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." From 9a49aede2268724aa7f26b969da58befdd20cc53 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 20 Feb 2023 09:51:54 +0100 Subject: [PATCH 34/81] JPMC removed 13694 --- app/_partner/jpmc.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/_partner/jpmc.md b/app/_partner/jpmc.md index 346ab6e92..e332eab31 100644 --- a/app/_partner/jpmc.md +++ b/app/_partner/jpmc.md @@ -106,8 +106,6 @@ tm-projects: desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 14026 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 13694 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 12287 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13969 From 3757b6db9de0918230a399d188d59ab2badcc70b Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 20 Feb 2023 09:58:36 +0100 Subject: [PATCH 35/81] ACTHOT removed 14063, 14065, added 14086, 14087 --- app/_partner/acthot.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index 79b931ded..2776ecc6e 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -18,15 +18,15 @@ subhashtags: tm-projects: - id: 12311 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14063 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14065 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14066 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14082 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14083 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14086 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14087 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 4fe03805ed62c619e017745f43dad6713b4b952c Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 20 Feb 2023 09:59:17 +0100 Subject: [PATCH 36/81] test --- app/_partner/acthot.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index 2776ecc6e..b5d0f5ece 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -27,6 +27,6 @@ tm-projects: - id: 14086 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14087 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From ee5564f3dbc41c4e555468172b957fc575f49f45 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 20 Feb 2023 10:00:57 +0100 Subject: [PATCH 37/81] Update acthot.md --- app/_partner/acthot.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index b5d0f5ece..719c0b1f8 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -24,9 +24,9 @@ tm-projects: desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14083 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14086 + - id: 14086 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14087 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14087 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 9ab947b25f051a9f38f7e847660527f1bebe111c Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 20 Feb 2023 10:02:25 +0100 Subject: [PATCH 38/81] AMM removed 14047 --- app/_partner/amm.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/_partner/amm.md b/app/_partner/amm.md index 1bd3bccc7..6dda930e7 100644 --- a/app/_partner/amm.md +++ b/app/_partner/amm.md @@ -29,8 +29,6 @@ tm-projects: desc: "GREAT FOR NEW MAPPERS! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 14048 desc: "GREAT FOR NEW MAPPERS! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - - id: 14047 - desc: "GREAT FOR NEW MAPPERS! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 14051 desc: "GREAT FOR NEW MAPPERS! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 14052 From 1011123f1ce24b94aab9311bf78603edd6f304ca Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 20 Feb 2023 10:05:19 +0100 Subject: [PATCH 39/81] Atlassian removed 14079, added 14088 --- app/_partner/atlassian.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/_partner/atlassian.md b/app/_partner/atlassian.md index bcd293905..626d6e529 100644 --- a/app/_partner/atlassian.md +++ b/app/_partner/atlassian.md @@ -17,7 +17,7 @@ subhashtags: - atlassianemea tm-projects: - - id: 14079 + - id: 14088 desc: "GREAT FOR NEW MAPPERS! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 14050 desc: "GREAT FOR NEW MAPPERS! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." From f778bd3ba4845967f554e69100fa3891f8af0f8f Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 20 Feb 2023 14:25:31 +0100 Subject: [PATCH 40/81] Bloomberg, updated priority text --- app/_partner/bloomberg.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/_partner/bloomberg.md b/app/_partner/bloomberg.md index 2bec04d82..20d8c162d 100644 --- a/app/_partner/bloomberg.md +++ b/app/_partner/bloomberg.md @@ -26,15 +26,15 @@ subhashtags: tm-projects: - id: 13155 - desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." + desc: "MAP ME FIRST! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 13432 - desc: "This remote mapping of buildings will support the implementation of post census activities, such as data visualization, preparation of the Census Atlases, as well as dynamic web maps for data dissemination." + desc: "MAP ME FIRST! This remote mapping of buildings will support the implementation of post census activities, such as data visualization, preparation of the Census Atlases, as well as dynamic web maps for data dissemination." - id: 13750 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13934 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13749 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14075 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." From cfea816f8a2d2a841481c334cb2ce356cb910f75 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Tue, 21 Feb 2023 12:00:24 +0100 Subject: [PATCH 41/81] ACTHOT removed 14066 added 14089 --- app/_partner/acthot.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index 719c0b1f8..fc0aa9307 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -18,8 +18,6 @@ subhashtags: tm-projects: - id: 12311 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14066 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14082 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14083 @@ -28,5 +26,7 @@ tm-projects: desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14087 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14089 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 4ec09e59e7df9f3aefbdcf60de0245544c6019bd Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Wed, 22 Feb 2023 10:13:13 +0100 Subject: [PATCH 42/81] ACTHOT removed 14082, added 14090 --- app/_partner/acthot.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index fc0aa9307..244b87ed9 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -18,8 +18,6 @@ subhashtags: tm-projects: - id: 12311 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14082 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14083 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14086 @@ -28,5 +26,7 @@ tm-projects: desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14089 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14090 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From dac4b515e2d1a3b3573d0b9104ce1238a0135962 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Thu, 23 Feb 2023 09:57:33 +0100 Subject: [PATCH 43/81] ACTHOT removed 14086, added 14091 --- app/_partner/acthot.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index 244b87ed9..badc3062e 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -20,13 +20,13 @@ tm-projects: desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14083 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14086 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14087 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14089 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14090 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14091 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 03e8bf5755967119696a51389fd44cb283b07b88 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 27 Feb 2023 09:17:00 +0100 Subject: [PATCH 44/81] ACTHOT removed 14083, added 14092 --- app/_partner/acthot.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index badc3062e..6b516b7f7 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -18,8 +18,6 @@ subhashtags: tm-projects: - id: 12311 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14083 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14087 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14089 @@ -28,5 +26,7 @@ tm-projects: desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14091 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14092 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From f6465071a3e49414c597461b2c3fbeacd885a440 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 27 Feb 2023 16:14:22 +0100 Subject: [PATCH 45/81] AMM removed 14051 --- app/_partner/amm.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/_partner/amm.md b/app/_partner/amm.md index 6dda930e7..a85dd78fd 100644 --- a/app/_partner/amm.md +++ b/app/_partner/amm.md @@ -29,8 +29,6 @@ tm-projects: desc: "GREAT FOR NEW MAPPERS! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 14048 desc: "GREAT FOR NEW MAPPERS! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - - id: 14051 - desc: "GREAT FOR NEW MAPPERS! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 14052 desc: "GREAT FOR NEW MAPPERS! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 14053 From ac457150901c6f25133f435a41f640684ed29b29 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 27 Feb 2023 16:19:44 +0100 Subject: [PATCH 46/81] BOFA removed 14078, 13821, 13945, 13946, 14046 --- app/_partner/bofa.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/app/_partner/bofa.md b/app/_partner/bofa.md index 660a6c7ae..db701a656 100644 --- a/app/_partner/bofa.md +++ b/app/_partner/bofa.md @@ -20,15 +20,5 @@ subhashtags: - bofavolunteers tm-projects: - - id: 14078 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 13821 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 13945 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 13946 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14046 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 0877f005ad6b63d7c6dd75d0e66ac941ed8a8735 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Tue, 28 Feb 2023 10:07:51 +0100 Subject: [PATCH 47/81] ACTHOT removed 14087 --- app/_partner/acthot.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index 6b516b7f7..13069544b 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -18,8 +18,6 @@ subhashtags: tm-projects: - id: 12311 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14087 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14089 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14090 From 56866701afd743ce286a051045dfd98e49f55045 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Tue, 28 Feb 2023 15:51:21 +0100 Subject: [PATCH 48/81] AC r 14058, 14001, 14061, 14003, 13299 add 14357 --- app/_partner/accenture_2019.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/_partner/accenture_2019.md b/app/_partner/accenture_2019.md index b596cfc7f..9d15614ef 100644 --- a/app/_partner/accenture_2019.md +++ b/app/_partner/accenture_2019.md @@ -37,9 +37,9 @@ subhashtags: - acnfy23 tm-projects: - - id: 14058 + - id: 14357 desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - - id: 14001 + - id: desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 14061 desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." From 2493378c08185a71dc6c31d354fd1865e1340b89 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Tue, 28 Feb 2023 15:52:28 +0100 Subject: [PATCH 49/81] ACC added 14358, 14359, 14361, 14362 --- app/_partner/accenture_2019.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/_partner/accenture_2019.md b/app/_partner/accenture_2019.md index 9d15614ef..c579d8cd3 100644 --- a/app/_partner/accenture_2019.md +++ b/app/_partner/accenture_2019.md @@ -39,13 +39,13 @@ subhashtags: tm-projects: - id: 14357 desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - - id: + - id: 14358 desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - - id: 14061 + - id: 14359 desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - - id: 14003 + - id: 14361 + desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." + - id: 14362 desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - - id: 13299 - desc: "FOR EXPERIENCED MAPPERS: This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." --- From 6a6e47420d5924d1699b2d8d9f578de6e8dc7578 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Wed, 1 Mar 2023 13:45:17 +0100 Subject: [PATCH 50/81] Bloomberg removed 13432, added 14093 --- app/_partner/bloomberg.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/_partner/bloomberg.md b/app/_partner/bloomberg.md index 20d8c162d..69ee133cb 100644 --- a/app/_partner/bloomberg.md +++ b/app/_partner/bloomberg.md @@ -27,16 +27,16 @@ subhashtags: tm-projects: - id: 13155 desc: "MAP ME FIRST! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - - id: 13432 - desc: "MAP ME FIRST! This remote mapping of buildings will support the implementation of post census activities, such as data visualization, preparation of the Census Atlases, as well as dynamic web maps for data dissemination." - id: 13750 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13934 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13749 desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14075 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14093 + desc: "MAP ME LAST! This remote mapping of buildings will support the implementation of post census activities, such as data visualization, preparation of the Census Atlases, as well as dynamic web maps for data dissemination." --- From 8761d6e2f39538d5692032fe4beb75ff3148b64c Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Wed, 1 Mar 2023 13:50:28 +0100 Subject: [PATCH 51/81] ACTHOT removed 14089, added 14094 --- app/_partner/acthot.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index 13069544b..0ea88b33e 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -17,14 +17,14 @@ subhashtags: tm-projects: - id: 12311 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14089 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14090 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14091 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14092 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14094 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 10a9cf04a6c160bf7821dc453ae643473eee57cf Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Wed, 1 Mar 2023 13:53:00 +0100 Subject: [PATCH 52/81] BOFA added 14095 --- app/_partner/bofa.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/_partner/bofa.md b/app/_partner/bofa.md index db701a656..b995e7e98 100644 --- a/app/_partner/bofa.md +++ b/app/_partner/bofa.md @@ -20,5 +20,7 @@ subhashtags: - bofavolunteers tm-projects: + - id: 14095 + desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From d852d1ae4644999223313b2ef05cd75c40a7b0b6 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Wed, 1 Mar 2023 17:53:13 +0100 Subject: [PATCH 53/81] Bloomberg, removed 14092 temporarily --- app/_partner/bloomberg.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/_partner/bloomberg.md b/app/_partner/bloomberg.md index 69ee133cb..cb9646266 100644 --- a/app/_partner/bloomberg.md +++ b/app/_partner/bloomberg.md @@ -28,15 +28,13 @@ tm-projects: - id: 13155 desc: "MAP ME FIRST! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 13750 - desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + desc: "MAP ME LAST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13934 desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13749 desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14075 desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14093 - desc: "MAP ME LAST! This remote mapping of buildings will support the implementation of post census activities, such as data visualization, preparation of the Census Atlases, as well as dynamic web maps for data dissemination." --- From 40ffffc83f59c32b6b4db417c5e7a1d14e0a67c2 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Thu, 2 Mar 2023 09:39:07 +0100 Subject: [PATCH 54/81] Bloomberg removed 13155 --- app/_partner/bloomberg.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/_partner/bloomberg.md b/app/_partner/bloomberg.md index cb9646266..dac6c6b45 100644 --- a/app/_partner/bloomberg.md +++ b/app/_partner/bloomberg.md @@ -25,16 +25,14 @@ subhashtags: - latam tm-projects: - - id: 13155 - desc: "MAP ME FIRST! This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - - id: 13750 - desc: "MAP ME LAST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13934 desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13749 desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14075 desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 13750 + desc: "MAP ME LAST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 7cefa6b16d217b092cae9f255f15decad3b17232 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Thu, 2 Mar 2023 09:43:12 +0100 Subject: [PATCH 55/81] ACTHOT removed 14091 --- app/_partner/acthot.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index 0ea88b33e..84a9b997b 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -20,8 +20,6 @@ tm-projects: desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14090 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14091 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14092 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14094 From 667d799eb4fb4407616f19e8402228f1839091ff Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 6 Mar 2023 08:31:23 +0100 Subject: [PATCH 56/81] Salesforce removed 14072 --- app/_partner/salesforce.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/_partner/salesforce.md b/app/_partner/salesforce.md index 3530dda1f..ae224e45b 100644 --- a/app/_partner/salesforce.md +++ b/app/_partner/salesforce.md @@ -80,8 +80,6 @@ subhashtags: - sfsemap6 tm-projects: -- id: 14072 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14035 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14005 From ac1b52bff90eadce2110e8b317853484c3f759e1 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 6 Mar 2023 08:35:32 +0100 Subject: [PATCH 57/81] Bloomberg removed 14075 --- app/_partner/bloomberg.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/_partner/bloomberg.md b/app/_partner/bloomberg.md index dac6c6b45..255b57a43 100644 --- a/app/_partner/bloomberg.md +++ b/app/_partner/bloomberg.md @@ -29,8 +29,6 @@ tm-projects: desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13749 desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14075 - desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13750 desc: "MAP ME LAST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." From 7772dd194da24212879e7cdde00d17a594ed5eb4 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 6 Mar 2023 08:39:02 +0100 Subject: [PATCH 58/81] JPMC removed 13969, 13412 --- app/_partner/jpmc.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/_partner/jpmc.md b/app/_partner/jpmc.md index e332eab31..1fc3af763 100644 --- a/app/_partner/jpmc.md +++ b/app/_partner/jpmc.md @@ -98,8 +98,6 @@ subhashtags: tm-projects: - - id: 13412 - desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 13413 desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 13433 @@ -108,8 +106,6 @@ tm-projects: desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 12287 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 13969 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13937 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." From 6a7e7b94e867f8de045bc24dafe21edf1fa353d5 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 6 Mar 2023 08:42:21 +0100 Subject: [PATCH 59/81] ACTHOT removed 14090, 14092, 14094 --- app/_partner/acthot.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index 84a9b997b..c46db5a02 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -18,11 +18,5 @@ subhashtags: tm-projects: - id: 12311 desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14090 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14092 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - - id: 14094 - desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 788e6c96abd8e4b07124eb2e956b801f6fd16139 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Mon, 6 Mar 2023 11:15:36 +0100 Subject: [PATCH 60/81] JPMC removed 13433 --- app/_partner/jpmc.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/_partner/jpmc.md b/app/_partner/jpmc.md index 1fc3af763..a82653527 100644 --- a/app/_partner/jpmc.md +++ b/app/_partner/jpmc.md @@ -100,8 +100,6 @@ subhashtags: tm-projects: - id: 13413 desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - - id: 13433 - desc: "This remote mapping of buildings will support the implementation of planned activities and largely the generation of data for humanitarian activities in the identified provinces." - id: 14026 desc: "This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 12287 From b9bb2e326c3558b2abc31ee613fb3849932dddf2 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Tue, 7 Mar 2023 17:35:17 +0100 Subject: [PATCH 61/81] ACTHOT added 14058 --- app/_partner/acthot.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index c46db5a02..a93327b13 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -18,5 +18,7 @@ subhashtags: tm-projects: - id: 12311 desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14058 + desc: "MAP ME SECOND! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From de4da62833521acfada234d1d344237dc01e2e21 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Tue, 7 Mar 2023 17:41:25 +0100 Subject: [PATCH 62/81] ACTHOT added 14001 --- app/_partner/acthot.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index a93327b13..da9e4f152 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -20,5 +20,7 @@ tm-projects: desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14058 desc: "MAP ME SECOND! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14001 + desc: "MAP ME THIRD! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From f843782a2255fbb611e60247607c847e4ac90a55 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Wed, 8 Mar 2023 10:31:55 +0100 Subject: [PATCH 63/81] Bloomberg added 14093, 14061 --- app/_partner/bloomberg.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/_partner/bloomberg.md b/app/_partner/bloomberg.md index 255b57a43..a2aac4935 100644 --- a/app/_partner/bloomberg.md +++ b/app/_partner/bloomberg.md @@ -31,6 +31,10 @@ tm-projects: desc: "MAP ME FIRST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 13750 desc: "MAP ME LAST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14093 + desc: "MAP ME LAST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14061 + desc: "MAP ME LAST! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 6b1713affaa13000dbe2f5fb850d88caa2c3e676 Mon Sep 17 00:00:00 2001 From: Nicole <15011784+nicolelaine@users.noreply.github.com> Date: Thu, 9 Mar 2023 16:34:32 +0100 Subject: [PATCH 64/81] ACTHOT added 14003 --- app/_partner/acthot.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index da9e4f152..cf9200e38 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -22,5 +22,7 @@ tm-projects: desc: "MAP ME SECOND! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." - id: 14001 desc: "MAP ME THIRD! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." + - id: 14003 + desc: "MAP ME THIRD! This remote mapping of buildings will support the identification and characterization of settlements, as well as the implementation of planned activities and largely the generation of data for humanitarian activities." --- From 1373cf3b7e695a585c549ebc18590b4768399445 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 16:55:39 +0000 Subject: [PATCH 65/81] Added deploy to config file --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 67438597d..800aaed5b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,6 +40,9 @@ jobs: - run: name: Run Build command: npm run build-prod + - deploy: + name: Deploy + command: ./.build_scripts/deploy.sh # Orchestrate our job run sequence workflows: version: 2 From c4e2bf874532f70725cf0ed6bf0d3fdf9d9fe413 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 16:59:02 +0000 Subject: [PATCH 66/81] Changed gh-pages-branch --- .build_scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index d2ef1fcd1..c887053c3 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -6,7 +6,7 @@ if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then echo "Get ready, we're pushing to gh-pages!" git config user.name "CIRCLECI" git config user.email "circleci@somewhere.com" - node_modules/.bin/gh-pages -x -d _site -b gh-pages -r $CIRCLE_REPOSITORY_URL + node_modules/.bin/gh-pages -x -d _site -b gh-pages-test -r $CIRCLE_REPOSITORY_URL else echo "Not a publishable branch so we're all done here" fi From 88f183cfab1e9eec91a8b5daa8aff0b9c5c59dbe Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Thu, 9 Mar 2023 19:07:53 +0000 Subject: [PATCH 67/81] Changed gh-pages-branch test back to original --- .build_scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index c887053c3..d2ef1fcd1 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -6,7 +6,7 @@ if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then echo "Get ready, we're pushing to gh-pages!" git config user.name "CIRCLECI" git config user.email "circleci@somewhere.com" - node_modules/.bin/gh-pages -x -d _site -b gh-pages-test -r $CIRCLE_REPOSITORY_URL + node_modules/.bin/gh-pages -x -d _site -b gh-pages -r $CIRCLE_REPOSITORY_URL else echo "Not a publishable branch so we're all done here" fi From d4aca5c486fc4c14ca8b4330198208c5dbf0fdc0 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Fri, 10 Mar 2023 14:23:42 +0000 Subject: [PATCH 68/81] Updated Ruby version because Travis build is failing --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ed10bfa02..658c7b521 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - 2.7.4 + - 2.7.5 env: global: - TRAVIS_NODE_VERSION="v8" From 0c3deee21102df2591af3e53b784e3b53a7423a8 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 15 Mar 2023 12:26:43 +0000 Subject: [PATCH 69/81] Fixing the deploy the branch --- .build_scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index d2ef1fcd1..4ee15838e 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -6,7 +6,7 @@ if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then echo "Get ready, we're pushing to gh-pages!" git config user.name "CIRCLECI" git config user.email "circleci@somewhere.com" - node_modules/.bin/gh-pages -x -d _site -b gh-pages -r $CIRCLE_REPOSITORY_URL + node_modules/.bin/gh-pages -x -d _site -b gh-pages -r "https://${GH_TOKEN}@github.com/${CIRCLE_REPOSITORY_URL}.git" else echo "Not a publishable branch so we're all done here" fi From 5ee4551290b110bb442be6257bb35ab273ed9129 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 12:45:22 +0000 Subject: [PATCH 70/81] Added opsgenie orb to config --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 800aaed5b..658d9489f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,3 +49,6 @@ workflows: build_and_deploy: jobs: - build-deploy +notify: + webhooks: + - url: https://api.opsgenie.com/v1/json/circleci?apiKey=$OPSGENIE_API From d21b19f08d449e06d3642d51e59e6eec3840d080 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 12:49:52 +0000 Subject: [PATCH 71/81] Replicating a failed build to test Opsgenie orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 658d9489f..47f1b3ca9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: echo 'source ${NVM_DIR}/nvm.sh' --install >> $BASH_ENV - run: name: Build Node v8 nvm - command: nvm install v8.1.2 + command: nvm install v1.1.2 - run: name: Install dependencies command: | From 37f8535f75dee5b83b60e462301b953d0c3a7f29 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 14:47:02 +0000 Subject: [PATCH 72/81] Configuring git to script --- .build_scripts/deploy.sh | 6 +++--- .circleci/config.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index 4ee15838e..1d90f78ed 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -4,9 +4,9 @@ set -e # halt script on error # If this is the deploy branch, push it up to gh-pages if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then echo "Get ready, we're pushing to gh-pages!" - git config user.name "CIRCLECI" - git config user.email "circleci@somewhere.com" - node_modules/.bin/gh-pages -x -d _site -b gh-pages -r "https://${GH_TOKEN}@github.com/${CIRCLE_REPOSITORY_URL}.git" + git config user.name $USERNAME + git config user.email $EMAIL + node_modules/.bin/gh-pages -x -d _site -b gh-pages-test -r "https://github.com/${CIRCLE_REPOSITORY_URL}.git" else echo "Not a publishable branch so we're all done here" fi diff --git a/.circleci/config.yml b/.circleci/config.yml index 47f1b3ca9..658d9489f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: echo 'source ${NVM_DIR}/nvm.sh' --install >> $BASH_ENV - run: name: Build Node v8 nvm - command: nvm install v1.1.2 + command: nvm install v8.1.2 - run: name: Install dependencies command: | From 5cf850d9bb7a8cde2fc5186e5f40537b6e85a26c Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 16:34:41 +0000 Subject: [PATCH 73/81] Publishing branch --- .build_scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index 1d90f78ed..729b49bb2 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -6,7 +6,7 @@ if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then echo "Get ready, we're pushing to gh-pages!" git config user.name $USERNAME git config user.email $EMAIL - node_modules/.bin/gh-pages -x -d _site -b gh-pages-test -r "https://github.com/${CIRCLE_REPOSITORY_URL}.git" + node_modules/.bin/gh-pages -x -d _site -b gh-pages -r "https://github.com/${CIRCLE_REPOSITORY_URL}.git" else echo "Not a publishable branch so we're all done here" fi From b0d1162c0a7a3182ac5d4d061ee415e46d97b1ec Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 16:36:51 +0000 Subject: [PATCH 74/81] Publishing branch --- .build_scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index 729b49bb2..6d88b097e 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -6,7 +6,7 @@ if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then echo "Get ready, we're pushing to gh-pages!" git config user.name $USERNAME git config user.email $EMAIL - node_modules/.bin/gh-pages -x -d _site -b gh-pages -r "https://github.com/${CIRCLE_REPOSITORY_URL}.git" + node_modules/.bin/gh-pages -d _site -b gh-pages -r "https://github.com/${CIRCLE_REPOSITORY_URL}.git" else echo "Not a publishable branch so we're all done here" fi From 9c9db6fe5e58f4265db9de8ee3021b43e53d2f14 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 16:45:53 +0000 Subject: [PATCH 75/81] Publishing branch --- .build_scripts/deploy.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index 6d88b097e..1d5959a1e 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -3,10 +3,12 @@ set -e # halt script on error # If this is the deploy branch, push it up to gh-pages if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then + echo "CIRCLE_BRANCH: "$CIRCLE_BRANCH + echo "\$DEPLOY_BRANCH: " ${DEPLOY_BRANCH} echo "Get ready, we're pushing to gh-pages!" git config user.name $USERNAME git config user.email $EMAIL - node_modules/.bin/gh-pages -d _site -b gh-pages -r "https://github.com/${CIRCLE_REPOSITORY_URL}.git" + node_modules/.bin/gh-pages -x -d _site -b gh-pages -r "https://github.com/${CIRCLE_REPOSITORY_URL}.git" else echo "Not a publishable branch so we're all done here" fi From 3761b56ad46931f97dfa47564c223730b598d822 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 16:56:11 +0000 Subject: [PATCH 76/81] Publishing branch --- .build_scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index 1d5959a1e..dca4c88f4 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -8,7 +8,7 @@ if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then echo "Get ready, we're pushing to gh-pages!" git config user.name $USERNAME git config user.email $EMAIL - node_modules/.bin/gh-pages -x -d _site -b gh-pages -r "https://github.com/${CIRCLE_REPOSITORY_URL}.git" + node_modules/.bin/gh-pages -x -d build _site -b gh-pages -r "https://${GH_TOKEN}github.com/${CIRCLE_REPOSITORY_URL}.git" else echo "Not a publishable branch so we're all done here" fi From 4edfe251da035ba9bc6628243b118f833a1def4c Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 17:03:00 +0000 Subject: [PATCH 77/81] Publishing branch --- .build_scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index dca4c88f4..f4c161c8a 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -2,7 +2,7 @@ set -e # halt script on error # If this is the deploy branch, push it up to gh-pages -if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then +if $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ; then echo "CIRCLE_BRANCH: "$CIRCLE_BRANCH echo "\$DEPLOY_BRANCH: " ${DEPLOY_BRANCH} echo "Get ready, we're pushing to gh-pages!" From 24903b934a4d1d319c3a3eb6a162bbb3f60e7afa Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 17:05:55 +0000 Subject: [PATCH 78/81] Publishing branch --- .build_scripts/deploy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index f4c161c8a..a3389671c 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -2,9 +2,9 @@ set -e # halt script on error # If this is the deploy branch, push it up to gh-pages -if $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ; then - echo "CIRCLE_BRANCH: "$CIRCLE_BRANCH - echo "\$DEPLOY_BRANCH: " ${DEPLOY_BRANCH} +if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then + echo "CIRCLE_BRANCH: $CIRCLE_BRANCH" + echo "\$DEPLOY_BRANCH: ${DEPLOY_BRANCH}" echo "Get ready, we're pushing to gh-pages!" git config user.name $USERNAME git config user.email $EMAIL From 4696ee43308e112f64098231bfc4004cb1aebc17 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 17:08:27 +0000 Subject: [PATCH 79/81] Publishing branch --- .build_scripts/deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index a3389671c..2fcaf84b1 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -3,8 +3,8 @@ set -e # halt script on error # If this is the deploy branch, push it up to gh-pages if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then - echo "CIRCLE_BRANCH: $CIRCLE_BRANCH" - echo "\$DEPLOY_BRANCH: ${DEPLOY_BRANCH}" + echo "CIRCLE_BRANCH: " $CIRCLE_BRANCH + echo "\$DEPLOY_BRANCH: " ${DEPLOY_BRANCH} echo "Get ready, we're pushing to gh-pages!" git config user.name $USERNAME git config user.email $EMAIL From 401742c7e53a01218caabe771167a86d956a0c43 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 17:15:06 +0000 Subject: [PATCH 80/81] Publishing branch --- .build_scripts/deploy.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index 2fcaf84b1..1fe10a9d2 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -3,7 +3,8 @@ set -e # halt script on error # If this is the deploy branch, push it up to gh-pages if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then - echo "CIRCLE_BRANCH: " $CIRCLE_BRANCH + echo "CIRCLE_BRANCH: "$CIRCLE_BRANCH + echo "DEPLOY_BRANCH: " $DEPLOY_BRANCH echo "\$DEPLOY_BRANCH: " ${DEPLOY_BRANCH} echo "Get ready, we're pushing to gh-pages!" git config user.name $USERNAME From a6610f1cc12a72e3456c7bd34281f68cf1a0c7d6 Mon Sep 17 00:00:00 2001 From: AfiMaameDufie Date: Wed, 22 Mar 2023 17:18:17 +0000 Subject: [PATCH 81/81] Publishing branch --- .build_scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index 1fe10a9d2..2efff11a2 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -9,7 +9,7 @@ if [ $CIRCLE_BRANCH = ${DEPLOY_BRANCH} ]; then echo "Get ready, we're pushing to gh-pages!" git config user.name $USERNAME git config user.email $EMAIL - node_modules/.bin/gh-pages -x -d build _site -b gh-pages -r "https://${GH_TOKEN}github.com/${CIRCLE_REPOSITORY_URL}.git" + node_modules/.bin/gh-pages --dist _site --branch gh-pages --repo "https://${GH_TOKEN}github.com/${CIRCLE_REPOSITORY_URL}.git" else echo "Not a publishable branch so we're all done here" fi