doc: fix publishing workflow1 (#4)

fix  publishing workflow1

Signed-off-by: divya pillai <divya.pillai@nordicsemi.no>

Author: divipillai

.github/workflows/doc-build.yml

@@ -44,6 +44,9 @@ concurrency:
 
 jobs:
   doc-build-and-publish:
+    env:
+      ARCHIVE: "addon-serial_modem-${{inputs.documentation_tag}}.zip"
+
     runs-on: ubuntu-latest
 
     permissions:
@@ -69,49 +72,21 @@ jobs:
           sudo tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz -C /opt
           echo "/opt/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
 
-      - name: Compute documentation tag
-        id: doc_meta
-        run: |
-          # Manual dispatch honors `documentation_tag`; otherwise derive from ref / event.
-          DOCUMENTATION_TAG='${{ inputs.documentation_tag || '' }}'
-
-          VERSION_REGEX='^v([0-9a-zA-Z\.\-]+)$'
-          if [[ -z "$DOCUMENTATION_TAG" ]] && [[ ${GITHUB_REF#refs/tags/} =~ $VERSION_REGEX ]]; then
-            DOCUMENTATION_TAG="${BASH_REMATCH[1]}"
-          fi
-
-          if [[ -z "$DOCUMENTATION_TAG" ]] && [[ ${GITHUB_REF#refs/heads/} == "main" ]]; then
-            DOCUMENTATION_TAG="latest"
-          fi
-
-          if [[ -z "$DOCUMENTATION_TAG" ]] && [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            DOCUMENTATION_TAG="PR-${{ github.event.pull_request.number }}"
-          fi
-
-          if [[ -z "$DOCUMENTATION_TAG" ]]; then
-            DOCUMENTATION_TAG="latest"
-          fi
-
-          echo "documentation_tag=${DOCUMENTATION_TAG}" >> "$GITHUB_OUTPUT"
-          echo "DOCUMENTATION_TAG=${DOCUMENTATION_TAG}" >> "$GITHUB_ENV"
-          ARCHIVE_NAME="addon-serial_modem-${DOCUMENTATION_TAG}.zip"
-          echo "ARCHIVE_NAME=${ARCHIVE_NAME}" >> "$GITHUB_ENV"
-
       - name: Build documentation
         working-directory: doc
         run: |
           doxygen
           sphinx-build -M html . build
 
           cp custom.properties build/html
-          sed -i 's/__VERSION__/'"${DOCUMENTATION_TAG}"'/g' build/html/custom.properties
+          sed -i 's/__VERSION__/'"${{inputs.documentation_tag}}"'/g' build/html/custom.properties
 
           cp tags.yml build/html
-          sed -i 's/__VERSION__/'"${DOCUMENTATION_TAG}"'/g' build/html/tags.yml
+          sed -i 's/__VERSION__/'"${{inputs.documentation_tag}}"'/g' build/html/tags.yml
 
           cd build/html
 
-          zip -rq "${ARCHIVE_NAME}" .
+          zip -rq "${{env.ARCHIVE}}" .
           ls -lah .
           pwd
 
@@ -122,18 +97,17 @@ jobs:
           if-no-files-found: error
           retention-days: 2
           path: |
-            doc/build/html/${{ env.ARCHIVE_NAME }}
+            doc/build/html/${{env.ARCHIVE}}
 
       - name: Check version
         run: |
-          # Align with `monitor_*.txt` field 3 and doc-publish `OUTDIR` awk pattern.
           VERSION_REGEX="^v([0-9a-zA-Z\.\-]+)$"
           if [[ ${GITHUB_REF#refs/tags/} =~ $VERSION_REGEX ]]; then
             VERSION=${BASH_REMATCH[1]}
           elif [[ ${GITHUB_REF#refs/heads/} == "main" ]]; then
             VERSION="latest"
           elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            VERSION="PR-${{ github.event.number }}"
+            VERSION="pr-${{ github.event.number }}"
           fi
           echo "VERSION=${VERSION}"
           echo "VERSION=${VERSION}" >> "$GITHUB_ENV"

.github/workflows/doc-publish.yml

@@ -16,8 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
-      # `working-directory: doc/` requires that directory to exist. Without checkout,
-      # artifacts download to the repo root; `path: doc` places `docs` contents under `./doc`.
       - name: Download artifacts
         uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6
         with:
@@ -44,34 +42,17 @@ jobs:
           printf 'PR=%s\n' "$PR" >> "$GITHUB_ENV"
 
       - name: Upload to Azure storage
+        working-directory: doc
         env:
           AZCOPY_CONCURRENCY_VALUE: 1024
           NCS_DOC_SAS_PRS: ${{ secrets.NCS_DOC_SAS_PRS }}
           NCS_DOC_SAS_MAIN: ${{ secrets.NCS_DOC_SAS_MAIN }}
         run: |
-          set -euo pipefail
-          SRC="${GITHUB_WORKSPACE}/doc/${OUTDIR}"
-          if [[ ! -d "$SRC" ]]; then
-            echo "::error::Upload source missing: ${SRC}"
-            ls -la "${GITHUB_WORKSPACE}/doc" || true
-            exit 1
-          fi
           if [[ "${{ github.event.workflow_run.event }}" == "pull_request" ]]; then
-            BASE="${{ vars.NCS_DOC_PR_STORAGE_URL }}"
-            SAS="${NCS_DOC_SAS_PRS:-}"
+            azcopy cp $OUTDIR "${{ vars.NCS_DOC_PR_STORAGE_URL }}addons/serial-modem?$NCS_DOC_SAS_PRS" --recursive=true
           else
-            BASE="${{ vars.NCS_DOC_STORAGE_URL }}"
-            SAS="${NCS_DOC_SAS_MAIN:-}"
-          fi
-          # AzCopy treats non-https targets as local paths. Empty BASE yields "addons/serial-modem?..." and Local/Local errors.
-          if [[ -z "$BASE" ]] || [[ "$BASE" != http://* && "$BASE" != https://* ]]; then
-            echo "::error::Blob base URL missing or invalid. Set vars.NCS_DOC_STORAGE_URL (push) or vars.NCS_DOC_PR_STORAGE_URL (PR) to e.g. https://<account>.blob.core.windows.net/<container>/"
-            exit 1
+            azcopy cp $OUTDIR "${{ vars.NCS_DOC_STORAGE_URL }}addons/serial-modem?$NCS_DOC_SAS_MAIN" --recursive=true
           fi
-          BASE="${BASE%/}/"
-          DEST="${BASE}addons/serial-modem?${SAS}"
-          echo "Uploading to blob prefix ${BASE}addons/serial-modem"
-          azcopy copy "$SRC" "$DEST" --recursive --from-to LocalBlob
 
       - name: Find Comment
         if: ${{ github.event.workflow_run.event == 'pull_request' }}