CI Docs and Upload Fixes

.github/actions/upload/action.yml

@@ -1,24 +1,24 @@
-name: 'Upload Release'
-description: 'Uploads a built release file'
+name: Upload Release
+description: Uploads a built release file
 inputs:
   artifact_name:
-    description: 'artifact name'
+    description: artifact name
     required: true
   aws_key_id:
-    description: 'aws key id'
+    description: aws key id
     required: true
   aws_secret_access_key:
-    description: 'aws secret access key'
+    description: aws secret access key
     required: true
   source:
+    description: source location
     required: false
-    type: string
-    default: 'package'
+    default: package
 runs:
   using: "composite"
   steps:
     - name: Save artifact
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.artifact_name }}
         path: ${{ runner.temp }}/shadow_build_dir/${{ inputs.source }}/${{ inputs.artifact_name }}
@@ -27,16 +27,16 @@ runs:
       if: github.event_name == 'push'
       working-directory: ${{ runner.temp }}/shadow_build_dir/${{ inputs.source }}
       run: |
-            aws configure set aws_access_key_id ${{ inputs.aws_key_id }}
-            aws configure set aws_secret_access_key ${{ inputs.aws_secret_access_key }}
-            aws s3 cp ${{ inputs.artifact_name }} s3://qgroundcontrol/builds/${{ github.ref_name }}/${{ inputs.artifact_name }} --region us-west-2 --acl public-read
+        aws configure set aws_access_key_id ${{ inputs.aws_key_id }}
+        aws configure set aws_secret_access_key ${{ inputs.aws_secret_access_key }}
+        aws s3 cp ${{ inputs.artifact_name }} s3://qgroundcontrol/builds/${{ github.ref_name }}/${{ inputs.artifact_name }} --region us-west-2 --acl public-read
       shell: bash
 
     - name: Upload tagged stable build to S3 latest Bucket
       if: github.event_name == 'push' && github.ref_type == 'tag'
       working-directory: ${{ runner.temp }}/shadow_build_dir/${{ inputs.source }}
       run: |
-            aws configure set aws_access_key_id ${{ inputs.aws_key_id }}
-            aws configure set aws_secret_access_key ${{ inputs.aws_secret_access_key }}
-            aws s3 cp ${{ inputs.artifact_name }} s3://qgroundcontrol/latest/${{ inputs.artifact_name }} --region us-west-2 --acl public-read
+        aws configure set aws_access_key_id ${{ inputs.aws_key_id }}
+        aws configure set aws_secret_access_key ${{ inputs.aws_secret_access_key }}
+        aws s3 cp ${{ inputs.artifact_name }} s3://qgroundcontrol/latest/${{ inputs.artifact_name }} --region us-west-2 --acl public-read
       shell: bash

.github/workflows/docs_deploy.yml

@@ -1,79 +1,79 @@
-name: Deploy Docs
+name: Docs
 
 on:
   push:
     branches:
-      - 'master'
+      - master
       - 'Stable*'
     tags:
       - 'v*'
     paths:
-      - docs/**
+      - 'docs/**'
   pull_request:
-    branches:
-      - '*'
     paths:
-      - docs/**
+      - 'docs/**'
 
   workflow_dispatch:
 
 env:
-  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+  DOCS_DEPLOY: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.merged) }}
 
 jobs:
-  # Build job
   build:
     runs-on: ubuntu-latest
+    outputs:
+      DOCS_DEPLOY: ${{ env.DOCS_DEPLOY }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Not needed if lastUpdated is not enabled
+
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: npm
+
       - name: Install dependencies
         run: npm ci
+
       - name: Build with VitePress
         run: |
           npm run docs:build
           touch docs/.vitepress/dist/.nojekyll
 
       - name: Upload artifact
-        if: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.merged) }}
+        if: env.DOCS_DEPLOY
         uses: actions/upload-artifact@v4
         with:
           name: qgc_docs_build
           path: docs/.vitepress/dist/
           retention-days: 1
 
   deploy:
-    if: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.merged) }}
     needs: build
     runs-on: ubuntu-latest
+    if: needs.build.outputs.DOCS_DEPLOY
 
     steps:
       - name: Download Artifact
         uses: actions/download-artifact@v4
         with:
           name: qgc_docs_build
           path: ~/_book
-        
+
       - name: Deploy
+        env:
+          GIT_USER: ${{ secrets.PX4BUILDBOT_USER }}
+          GIT_PASS: ${{ secrets.PX4BUILDBOT_PASS }}
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         run: |
           git clone https://${{ secrets.PX4BUILDBOT_USER }}:${{ secrets.PX4BUILDBOT_ACCESSTOKEN }}@github.com/mavlink/docs.qgroundcontrol.com.git
-          rm -rf docs.qgroundcontrol.com/${BRANCH_NAME}
-          mkdir -p docs.qgroundcontrol.com/${BRANCH_NAME}
-          cp -r ~/_book/* docs.qgroundcontrol.com/${BRANCH_NAME}/
+          rm -rf docs.qgroundcontrol.com/${{ env.BRANCH_NAME }}
+          mkdir -p docs.qgroundcontrol.com/${{ env.BRANCH_NAME }}
+          cp -r ~/_book/* docs.qgroundcontrol.com/${{ env.BRANCH_NAME }}/
           cd docs.qgroundcontrol.com
           git config user.email "[email protected]"
           git config user.name "PX4BuildBot"
-          git add ${BRANCH_NAME}
+          git add ${{ env.BRANCH_NAME }}
           git commit -a -m "QGC docs build update `date`"
           git push origin master
-          
-        env:
-          GIT_USER: ${{ secrets.PX4BUILDBOT_USER }}
-          GIT_PASS: ${{ secrets.PX4BUILDBOT_PASS }}