diff --git a/.build_scripts/deploy.sh b/.build_scripts/deploy.sh index 9afa680c8..2efff11a2 100644 --- a/.build_scripts/deploy.sh +++ b/.build_scripts/deploy.sh @@ -2,11 +2,14 @@ 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_BRANCH = ${DEPLOY_BRANCH} ]; then + 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 "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 $USERNAME + git config user.email $EMAIL + 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 diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..658d9489f --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,54 @@ +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: cimg/ruby:2.7.5-node + auth: + username: $DOCKER_HUB_USER + password: $DOCKER_HUB_PASSWORD + steps: + - 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 + echo 'export NVM_DIR=$HOME/.nvm' >> $BASH_ENV + echo 'source ${NVM_DIR}/nvm.sh' --install >> $BASH_ENV + - 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 + - deploy: + name: Deploy + command: ./.build_scripts/deploy.sh +# Orchestrate our job run sequence +workflows: + version: 2 + build_and_deploy: + jobs: + - build-deploy +notify: + webhooks: + - url: https://api.opsgenie.com/v1/json/circleci?apiKey=$OPSGENIE_API 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" 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' diff --git a/app/_partner/accenture_2019.md b/app/_partner/accenture_2019.md index b596cfc7f..c579d8cd3 100644 --- a/app/_partner/accenture_2019.md +++ b/app/_partner/accenture_2019.md @@ -37,15 +37,15 @@ 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: 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." --- diff --git a/app/_partner/acthot.md b/app/_partner/acthot.md index 6a75c63b0..cf9200e38 100644 --- a/app/_partner/acthot.md +++ b/app/_partner/acthot.md @@ -16,21 +16,13 @@ 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 - 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 - 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: 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." + - 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." --- diff --git a/app/_partner/amm.md b/app/_partner/amm.md index 1bd3bccc7..a85dd78fd 100644 --- a/app/_partner/amm.md +++ b/app/_partner/amm.md @@ -29,10 +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 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 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." diff --git a/app/_partner/aws.md b/app/_partner/aws.md index 30e48d148..921acdb19 100644 --- a/app/_partner/aws.md +++ b/app/_partner/aws.md @@ -46,9 +46,9 @@ 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 + - 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." diff --git a/app/_partner/bloomberg.md b/app/_partner/bloomberg.md index 2bec04d82..a2aac4935 100644 --- a/app/_partner/bloomberg.md +++ b/app/_partner/bloomberg.md @@ -25,18 +25,16 @@ subhashtags: - latam 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." - - 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." - - 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." + 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: "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: 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." --- diff --git a/app/_partner/bofa.md b/app/_partner/bofa.md index 660a6c7ae..b995e7e98 100644 --- a/app/_partner/bofa.md +++ b/app/_partner/bofa.md @@ -20,15 +20,7 @@ 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 + - 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." --- diff --git a/app/_partner/hoganlovells.md b/app/_partner/hoganlovells.md index 743cbc3c4..bf4115eec 100644 --- a/app/_partner/hoganlovells.md +++ b/app/_partner/hoganlovells.md @@ -46,11 +46,11 @@ 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." - - 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." diff --git a/app/_partner/jpmc.md b/app/_partner/jpmc.md index 346ab6e92..a82653527 100644 --- a/app/_partner/jpmc.md +++ b/app/_partner/jpmc.md @@ -98,20 +98,12 @@ 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 - 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 - 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." 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