chore: Merge main (#423)

* fix: Update rust docs workflow (#420)

* chore: Deprecate Antora and adjust docs release workflow (#422)

chore: Update docs release workflow

---------

Co-authored-by: Nami <[email protected]>

Author: tirumerla

.github/workflows/release-please.yml

@@ -111,8 +111,8 @@ jobs:
         if: always()
 
   # Cargo lock update
-  update-cargo-lockfile-antora-version:
-    name: Update Cargo.lock and Antora version
+  update-cargo-lockfile:
+    name: Update Cargo.lock
     runs-on: ubuntu-latest
     needs: release-please
     if: ${{ needs.release-please.outputs.release_created == 'false' && needs.release-please.outputs.pr_created == 'true' }}
@@ -155,40 +155,15 @@ jobs:
           else
             echo "cargo_changed=false" >> $GITHUB_OUTPUT
           fi
-      - name: Update Antora version
-        id: update-antora
-        run: |-
-          MANIFEST=".github/release-please/manifest.json"
-          ANTORA="docs/antora.yml"
-          RAW_VERSION=$(jq -r '.["."]' "$MANIFEST")
-          NEW_VERSION=${RAW_VERSION%.*}.x
-          echo "Bumping Antora version to $NEW_VERSION in $ANTORA"
-          sed -i -E "s/^version:.*/version: $NEW_VERSION/" "$ANTORA"
-          git add "$ANTORA"
-          if ! git diff --cached --quiet "$ANTORA"; then
-            echo "antora_changed=true" >> $GITHUB_OUTPUT
-          else
-            echo "antora_changed=false" >> $GITHUB_OUTPUT
-          fi
       - name: Commit cargo update
-        if: ${{ steps.lock-file-commit.outputs.cargo_changed == 'true' || steps.update-antora.outputs.antora_changed == 'true' }}
-        uses: iarekylew00t/verified-bot-commit@68c52beb4042b7038cf40c4daf6e469f118c686b # v2.0.5
+        if: steps.lock-file-commit.outputs.cargo_changed == 'true'
+        uses: iarekylew00t/verified-bot-commit@d7e8eea1f154881e1f9d70a3fd933e740148b7f4  # v2.1.1
         with:
-          message: 'chore: Updating lock file and bumping version in antora file'
+          message: 'chore: Updating lock file'
           token: ${{ steps.gh-app-token.outputs.token }}
           ref: ${{ needs.release-please.outputs.release_branch }}
           files: |-
             Cargo.lock
-            docs/antora.yml
-
-  # Update rust docs link in nav.adoc
-  update-rust-docs-link:
-    needs: release-please
-    if: ${{ needs.release-please.outputs.release_created == 'false' }}
-    uses: ./.github/workflows/rust-docs-url.yml
-    with:
-      branch: ${{ github.ref_name }}
-    secrets: inherit
 
   # Trigger workflow to generate sbom
   release-sbom:

.github/workflows/rust-docs-url.yml

@@ -1,8 +1,8 @@
-[tasks.rust-antora]
-description = "Build Antora site and copy rust_docs"
+[tasks.rust-docs]
+description = "Update rust technical documentation"
 script = [
   "cargo doc --target-dir docs/rust_docs --release --no-deps --quiet --locked",
-  "bash scripts/rust_antora.sh"
+  "bash scripts/rust_docs.sh"
 ]
 
 [tasks.docker-compose-up]

Makefile.toml

@@ -1,4 +1,4 @@
 [build]
 base = "/"
-command = "rustup default stable && cargo install cargo-make --locked --force && cargo make rust-antora"
+command = "rustup default stable && cargo install cargo-make --locked --force && cargo make rust-docs"
 publish = "docs/build/site"

netlify.toml

@@ -6,8 +6,6 @@ set -euo pipefail
 # Base directories
 REPO_ROOT="$PWD"
 DOCS_DIR="$REPO_ROOT/docs"
-NAME=$(grep '^name:' "$DOCS_DIR/antora.yml" | awk '{print $2}')
-VERSION=$(grep '^version:' "$DOCS_DIR/antora.yml" | awk '{print $2}')
 BUILD_DIR="$DOCS_DIR/build/site"
 RUST_DOCS_DIR="$DOCS_DIR/rust_docs"