update CI config for flattened dir struc

Author: alexfornuto

.circleci/config.yml

@@ -24,7 +24,6 @@ jobs:
       - run:
           name: Install Gatsby
           command: |
-            cd gatsby
             npm ci
       - run:
           name: Import Gatsby Tokens
@@ -36,12 +35,11 @@ jobs:
       - run:
           name: Gatsby Build
           command: |
-            cd gatsby
             ./node_modules/gatsby/node_modules/.bin/gatsby build --prefix-paths
       - run:
           name: Remove empty directories
           command: |
-            find ~/build/gatsby/public -type d -empty -delete
+            find ~/build/public -type d -empty -delete
       - run:
           name: Check for merge conflicts
           command: .circleci/scripts/merge_conflicts.sh
@@ -65,7 +63,6 @@ jobs:
       - run:
           name: Serve Gatsby
           command: |
-            cd gatsby
             ./node_modules/gatsby/node_modules/.bin/gatsby serve --prefix-paths
           background: true
       - run:
@@ -128,7 +125,7 @@ jobs:
           name: Lighthouse Audit
           command: .circleci/tests/lighthouse/run
       - store_artifacts:
-          path: gatsby/lighthouse_data/
+          path: lighthouse_data/
           destination: lighthouse_data/
 
   deploy:

.circleci/scripts/functions.sh

@@ -31,9 +31,9 @@ protected-branches() {
 
 gatsby-tokens() {
 # Set GitHub API token
-    touch $BUILD_PATH/gatsby/.env.production
-    echo "GITHUB_API=$GITHUB_TOKEN" > $BUILD_PATH/gatsby/.env.production
-    echo "SEGMENT_KEY=$SEGMENT_KEY" >> $BUILD_PATH/gatsby/.env.production
+    touch $BUILD_PATH/.env.production
+    echo "GITHUB_API=$GITHUB_TOKEN" > $BUILD_PATH/.env.production
+    echo "SEGMENT_KEY=$SEGMENT_KEY" >> $BUILD_PATH/.env.production
     echo "GTM_ID=$GTM_ID" >> .env.production
 }
 

.circleci/scripts/manual-deploy.sh

@@ -16,8 +16,6 @@ if [[ $ENV == "live" && $SITE_UUID == "72e163bd-0054-4332-8bf8-219c50b78581" ]];
 else
   echo Deploying to the $ENV environment on the $SITE_NAME site...
 
-  # Move to the Gatsby directory
-  cd gatsby
 
   # Ask user if they want to regenerate Gatsby output
   read -p "Would you like to rebuild the Docs site? (Yy/Nn)" -n 1 -r

.circleci/tests/lighthouse/run

@@ -19,7 +19,7 @@ echo -e "\nProcessing pull request #$CIRCLE_PR_NUMBER"
 
 # Lighthouse audits
 echo -e "\nRunning lighthouse audits..."
-cd $BUILD_PATH/gatsby
+cd $BUILD_PATH/
 npm run lighthouse-run
 
 # Create the artifacts directory if needed

README.md

@@ -45,7 +45,7 @@ git@github.com:pantheon-systems/documentation.git
 ### Install
 
 ```
-cd documentation/gatsby
+cd documentation/
 npm ci
 ```
 #### GitHub Token
@@ -55,7 +55,7 @@ We use the [gatsby-remark-embed-snippet](https://github.com/gatsbyjs/gatsby/tree
 1. Click Generate new token
 1. Give it a name and click the public_repo checkbox, then the Generate Token button at the bottom
 1. Copy the token to your clipboard.
-1. Create or edit `gatsby/.env.development`, and add (replacing $TOKENHASH ):
+1. Create or edit `.env.development`, and add (replacing $TOKENHASH ):
 
    ```
    GITHUB_API=$TOKENHASH
@@ -64,7 +64,7 @@ We use the [gatsby-remark-embed-snippet](https://github.com/gatsbyjs/gatsby/tree
 ### Run
 
 ```
-cd documentation/gatsby
+cd documentation/
 gatsby develop
 ```