Fixes

Adventech · Nov 19, 2023 · 6058cb6 · 6058cb6
1 parent aa175d1
commit 6058cb6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/.github/workflows/deploy-resources.yml b/.github/workflows/deploy-resources.yml
@@ -6,6 +6,9 @@ on:
         required: true
         type: string
 
+env:
+  DEPLOY_ENV: ${{ inputs.branch }}
+
 jobs:
   deploy-resources:
     if: (github.repository == 'Adventech/sabbath-school-resources')
@@ -31,28 +34,16 @@ jobs:
         working-directory: ops/deploy/creds
       - run: node ops/deploy/deploy-documents.js
         name: Deploy documents
-        env:
-          DEPLOY_ENV: ${{ inputs.branch }}
       - run: node ops/deploy/deploy-sections.js
         name: Deploy categories
-        env:
-          DEPLOY_ENV: ${{ inputs.branch }}
       - run: node ops/deploy/deploy-categories.js
         name: Deploy categories
-        env:
-          DEPLOY_ENV: ${{ inputs.branch }}
       - run: node ops/deploy/deploy-authors.js
         name: Deploy authors
-        env:
-          DEPLOY_ENV: ${{ inputs.branch }}
       - run: node ops/deploy/deploy-resources.js
         name: Deploy resources
-        env:
-          DEPLOY_ENV: ${{ inputs.branch }}
       - run: node ops/deploy/deploy-languages.js
         name: Deploy languages
-        env:
-          DEPLOY_ENV: ${{ inputs.branch }}
       - run: aws s3 cp dist/ s3://sabbath-school`[[ "${{ inputs.branch }}" = "stage" ]] && echo '-stage'`.adventech.io --acl "public-read" --region us-east-1 --no-progress --recursive
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/ops/deploy/deploy-documents.js b/ops/deploy/deploy-documents.js
@@ -65,7 +65,9 @@ let processDocuments = async function (resourceType) {
                     }
                 }
             }
-            await database.collection(FIREBASE_DATABASE_BLOCKS).doc(block.id).set(block);
+            if (block && block.id) {
+                await database.collection(FIREBASE_DATABASE_BLOCKS).doc(block.id).set(block);
+            }
         }
 
         if (documentInfo.blocks) {

diff --git a/src/en/devo/test/content/blocks.md b/src/en/devo/test/content/blocks.md
@@ -113,7 +113,7 @@ Split this one
 
 Hello <sup>1</sup> In the beginning God created the heavens and the earth.
 
-Hello <sub>1</sub> In the beginning God created the heavens and the earth.
+Hello 2 <sub>1</sub> In the beginning God created the heavens and the earth.
 
 1. First
 2. Second