ci: udpate shim #83

permaweb · Feb 27, 2024 · 1cf74d3 · 1cf74d3
1 parent 909e8ee
commit 1cf74d3
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 41 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -145,57 +145,57 @@ jobs:
             sleep 2
           done
 
-          echo "##### UPLOAD THEME FILE SHIM #####"
+          # echo "##### UPLOAD THEME FILE SHIM #####"
 
-          CHUNKS_FOLDER=$(\
-            ardrive list-folder \
-              --all \
-              --parent-folder-id "${FOLDER_ID}" \
-              | jq -r '.[] | select(.path | endswith("assets/chunks")) | .entityId'
-          )
+          # CHUNKS_FOLDER=$(\
+          #   ardrive list-folder \
+          #     --all \
+          #     --parent-folder-id "${FOLDER_ID}" \
+          #     | jq -r '.[] | select(.path | endswith("assets/chunks")) | .entityId'
+          # )
 
-          echo "${CHUNKS_FOLDER}"
+          # echo "${CHUNKS_FOLDER}"
 
-          ardrive upload-file \
-            --turbo \
-            --parent-folder-id "${CHUNKS_FOLDER}" \
-            --local-path "${ARTIFACTS_OUTPUT_DIR}"/assets/chunks/theme.js \
-            -w "${WALLET}"
+          # ardrive upload-file \
+          #   --turbo \
+          #   --parent-folder-id "${CHUNKS_FOLDER}" \
+          #   --local-path "${ARTIFACTS_OUTPUT_DIR}"/assets/chunks/theme.js \
+          #   -w "${WALLET}"
 
-          echo "##### END THEME FILE SHIM #####"
+          # echo "##### END THEME FILE SHIM #####"
 
           echo "Generating Manifest..."
 
-          ARDRIVE_MANIFEST_RESULTS=$(\
-            ardrive create-manifest \
-              --turbo \
-              -f "${FOLDER_ID}" \
-              -w "${WALLET}"
-          )
+          # ARDRIVE_MANIFEST_RESULTS=$(\
+          #   ardrive create-manifest \
+          #     --turbo \
+          #     -f "${FOLDER_ID}" \
+          #     -w "${WALLET}"
+          # )
 
-          # echo "##### CUSTOM MANIFEST SHIM #####"
+          echo "##### CUSTOM MANIFEST SHIM #####"
 
-          # ardrive create-manifest \
-          #   --turbo \
-          #   -f "${FOLDER_ID}" \
-          #   -w "${WALLET}" \
-          #   --dry-run \
-          #   | jq '{manifest}.manifest' > ${LOCAL_MANIFEST}
+          ardrive create-manifest \
+            --turbo \
+            -f "${FOLDER_ID}" \
+            -w "${WALLET}" \
+            --dry-run \
+            | jq '{manifest}.manifest' > ${LOCAL_MANIFEST}
 
-          # npm run shim-manifest
+          npm run shim-manifest
 
-          # echo "Uploading shimmed manifest..."
+          echo "Uploading shimmed manifest..."
 
-          # ARDRIVE_MANIFEST_RESULTS=$(\
-          #   ardrive upload-file \
-          #     --turbo \
-          #     --parent-folder-id "${FOLDER_ID}" \
-          #     --local-path ${LOCAL_MANIFEST} \
-          #     --content-type "application/x.arweave-manifest+json" \
-          #     -w "${WALLET}"
-          # )
+          ARDRIVE_MANIFEST_RESULTS=$(\
+            ardrive upload-file \
+              --turbo \
+              --parent-folder-id "${FOLDER_ID}" \
+              --local-path ${LOCAL_MANIFEST} \
+              --content-type "application/x.arweave-manifest+json" \
+              -w "${WALLET}"
+          )
 
-          # echo "##### END CUSTOM MANIFEST SHIM #####"
+          echo "##### END CUSTOM MANIFEST SHIM #####"
 
           echo "${ARDRIVE_MANIFEST_RESULTS}"
 
@@ -213,4 +213,5 @@ jobs:
           ARTIFACTS_OUTPUT_DIR: ${{ steps.build_artifacts.outputs.artifacts_output_dir }}
           ARDRIVE_FOLDER_ID: ${{ secrets.CLI_ARDRIVE_FOLDER_ID }}
           LOCAL_MANIFEST: DriveManifest.json
-          THEME_TX_ID: hN2dnfuji-Z56CxJ-T0Y1sZ-jTuSJUkU2q26DDGBJl0
+          THEME_TX_ID: x5iNUndl8l2SgSAjv0Pt8HvvdBvuswLU0huES3_AF-c
+          FRAMEWORK_TX_ID: rER7ZqcQSoTR9vjcHuq0bIqLMO1PfcQ06KQTF5HmRkM
diff --git a/deploy.js b/deploy.js
@@ -45,6 +45,7 @@ const actions = {
   async SHIM_MANIFEST() {
     const LOCAL_MANIFEST = env("LOCAL_MANIFEST");
     const THEME_TX_ID = env("THEME_TX_ID");
+    const FRAMEWORK_TX_ID = env("FRAMEWORK_TX_ID");
 
     const manifest = JSON.parse(readFileSync(LOCAL_MANIFEST));
 
@@ -54,9 +55,13 @@ const actions = {
      * For now, we've manually uploaded this file separately, then shim
      * it into the manifest using this
      *
-     * assets/chunks/theme.b4WnDNzP.js -> THEME_TX_ID
+     * assets/chunks/theme.js -> THEME_TX_ID
+     * assets/chunks/framework.js -> FRAMEWORK_TX_ID
      */
-    manifest.paths["assets/chunks/theme.b4WnDNzP.js"] = { id: THEME_TX_ID };
+    manifest.paths["assets/chunks/theme.js"] = { id: THEME_TX_ID };
+    manifest.paths["assets/chunks/framework.js"] = { id: FRAMEWORK_TX_ID };
+
+    console.log(manifest);
 
     writeFileSync(LOCAL_MANIFEST, JSON.stringify(manifest, null, 2));
   },