Merge branch 'deathbedsgh-26-keep-last-known-good' into try-lite-1263

bollwyvl · Dec 15, 2023 · b2c4332 · b2c4332
2 parents eaf2913 + 67ece1c
commit b2c4332
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/docs/.readthedocs.yaml b/docs/.readthedocs.yaml
@@ -20,7 +20,6 @@ build:
       - JPYK_LOG_NAME=shave2          doit shave                             || echo 'ok'
       - doit self:docs:deploy:work                                           || echo 'ok'
       - JPYK_ALLOW_NO_CONFIG=1        doit self:docs:graph                   || echo 'ok'
-      - JPYK_FETCH_LAST_KNOWN_GOOD=1  doit self:last_known_good              || echo 'ok'
       - JPYK_FETCH_LAST_KNOWN_GOOD=1  doit self:docs:deploy:last-known-good  || echo 'ok'
 
 sphinx:

diff --git a/src/jupyak/tasks/_self.ipynb b/src/jupyak/tasks/_self.ipynb
@@ -434,14 +434,20 @@
     "        )\n",
     "        sphinx_task_dep += [\"self:docs:deploy:work\", \"self:docs:deploy:favicon\"]\n",
     "    elif FETCH_LAST_KNOWN_GOOD:\n",
+    "        archive_name = L.last_known_good_urls()[0]\n",
     "        last_good_build_shasums = BUILD_LAST_KNOWN_GOOD / W.SHA256SUMS\n",
     "        last_good_docs_shasums = DOCS_STATIC_LAST_KNOWN_GOOD / W.SHA256SUMS\n",
+    "        archive = BUILD / archive_name\n",
+    "        static_archive = DOCS_STATIC_LAST_KNOWN_GOOD / archive.name\n",
     "        yield dict(\n",
     "            name=\"deploy:last-known-good\",\n",
     "            doc=\"> copy last-known-good built assets to docs static\",\n",
-    "            actions=[(A.copy, [BUILD_LAST_KNOWN_GOOD, DOCS_STATIC_LAST_KNOWN_GOOD])],\n",
-    "            file_dep=[last_good_build_shasums],\n",
-    "            targets=[last_good_docs_shasums],\n",
+    "            actions=[\n",
+    "                (A.copy, [BUILD_LAST_KNOWN_GOOD, DOCS_STATIC_LAST_KNOWN_GOOD]),\n",
+    "                (A.copy, [archive, static_archive]),\n",
+    "            ],\n",
+    "            file_dep=[last_good_build_shasums, archive],\n",
+    "            targets=[last_good_docs_shasums, static_archive],\n",
     "        )\n",
     "        sphinx_task_dep += [\"self:docs:deploy:last-known-good\"]\n",
     "\n",