Merge branch 'dev' into imgrefresh-batch2

Author: lidiazuin

.github/workflows/docs-generate-html.yml

@@ -1,22 +1,59 @@
 
-name: "Generate and Publish HTML"
+name: "Generate HTML"
 
+# edit the list of branches according to your repository
+# the list of branches should contain all the branches in your Antora publish playbooks
 on:
   push:
     branches:
     - 'dev'
+    - 'main'
+    - '5.x'
+    - '4.4'
   workflow_dispatch:
 
+# change `dev` and `main` according to your repository's branch names
+# `dev` is the branch you use to build and publish to staging
+# `main` is the branch you use to build and publish to neo4j.com/docs
+# in some cases, PROD_BRANCH and DEV_BRANCH may be the same branch
 env:
-  PUBLISH_TO: ${{ github.ref == 'refs/heads/main' && 'prod' || 'dev' }}
+  PROD_BRANCH: 'main'
+  DEV_BRANCH: 'dev'
 
 jobs:
 
+  prepare-ref-env:
+    name: Set build branch and environments
+    runs-on: ubuntu-latest
+    outputs:
+      build-ref: ${{ steps.set-ref-env.outputs.build-ref }}
+      environments: ${{ steps.set-ref-env.outputs.environments }}
+    steps:
+      - name: Set Build Ref
+        id: set-ref-env
+        run: |
+          if [[ "${GITHUB_REF}" == "refs/heads/${{ env.DEV_BRANCH }}" ]]; then
+            build_from=${{ env.DEV_BRANCH }}
+            environments='["dev"]'
+          else
+            build_from=${{ env.PROD_BRANCH }}
+            environments='["prod"]'
+          fi
+          # if dev branch = prod branch publish to both
+          if [[ "${{ env.DEV_BRANCH }}" == "${{ env.PROD_BRANCH }}" ]]; then
+            environments='["dev","prod"]'
+          fi
+          echo "build-ref=${build_from}" >> $GITHUB_OUTPUT
+          echo "environments=${environments[@]}" >> $GITHUB_OUTPUT
+
   docs-build:
     name: Generate HTML
+    needs: prepare-ref-env
     uses: neo4j/docs-tools/.github/workflows/reusable-docs-build.yml@v2
     with:
       package-script: 'verify:publish'
+      build-ref: ${{needs.prepare-ref-env.outputs.build-ref}}
+      fetch-depth: 0
 
   docs-verify:
     name: Verify HTML
@@ -27,11 +64,15 @@ jobs:
 
   publish-html:
     name: Publish HTML
-    needs: docs-verify
+    needs: [docs-verify, prepare-ref-env]
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        environments: ${{ fromJson(needs.prepare-ref-env.outputs.environments) }}
+
     steps:
-      - name: Trigger Publish
+      - name: Publish to ${{ matrix.environments }}
         uses: peter-evans/repository-dispatch@bf47d102fdb849e755b0b0023ea3e81a44b6f570 # v2.1.2
         with:
           token: ${{ secrets.DOCS_DISPATCH_TOKEN }}
@@ -43,5 +84,5 @@ jobs:
               "repo": "${{ github.event.repository.name }}",
               "run_id": "${{ github.run_id }}",
               "args": "--dryrun",
-              "publish_env": "${{ env.PUBLISH_TO }}"
+              "publish_env": "${{ matrix.environments }}"
             }

modules/ROOT/content-nav.adoc

@@ -155,25 +155,25 @@
 *** xref:clustering/setup/deploy.adoc[]
 *** xref:clustering/setup/analytics-cluster.adoc[]
 *** xref:clustering/setup/single-to-cluster.adoc[]
+*** xref:clustering/setup/reconciler.adoc[]
 *** xref:clustering/setup/discovery.adoc[]
 *** xref:clustering/setup/routing.adoc[]
 *** xref:clustering/setup/encryption.adoc[]
 ** xref:clustering/servers.adoc[]
+** xref:clustering/unbind.adoc[]
 ** xref:clustering/databases.adoc[]
 ** Monitoring
 *** xref:clustering/monitoring/show-servers-monitoring.adoc[]
 *** xref:clustering/monitoring/show-databases-monitoring.adoc[]
 *** xref:clustering/monitoring/endpoints.adoc[]
 *** xref:clustering/monitoring/status-check.adoc[]
-** xref:clustering/disaster-recovery.adoc[]
+** Resilient cluster deployment
+*** xref:clustering/multi-region-deployment/geo-redundant-deployment.adoc[]
+*** xref:clustering/multi-region-deployment/multi-data-center-routing.adoc[]
+*** xref:clustering/multi-region-deployment/disaster-recovery.adoc[]
 //** xref:clustering/internals.adoc[]
 ** xref:clustering/settings.adoc[]
 ** xref:clustering/server-syntax.adoc[]
-** xref:clustering/clustering-advanced/index.adoc[]
-*** xref:clustering/clustering-advanced/default-database.adoc[]
-*** xref:clustering/clustering-advanced/unbind.adoc[]
-*** xref:clustering/clustering-advanced/multi-data-center-routing.adoc[]
-*** xref:clustering/clustering-advanced/reconciler.adoc[]
 ** xref:clustering/glossary.adoc[]
 
 * xref:backup-restore/index.adoc[]

modules/ROOT/images/2dc-balanced-membership.svg

@@ -271,7 +271,7 @@ The example assumes that you have backup artifacts located in the `myBucket/myDi
 +
 [source,shell]
 ----
-bin/neo4j-admin database restore --to-path=gs://myBucket/myDirectory/myBackup.backup mydatabase
+bin/neo4j-admin database restore --from-path=gs://myBucket/myDirectory/myBackup.backup mydatabase
 ----
 ======
 
@@ -285,7 +285,7 @@ The example assumes that you have backup artifacts located in the `myStorageAcco
 +
 [source,shell]
 ----
-bin/neo4j-admin database restore --to-path=azb://myStorageAccount/myContainer/myDirectory/myBackup.backup mydatabase
+bin/neo4j-admin database restore --from-path=azb://myStorageAccount/myContainer/myDirectory/myBackup.backup mydatabase
 ----
 ======
 =====