ci: adjust environment variables in documentation workflow

jaredhendrickson13 · May 19, 2024 · d069c7f · d069c7f
1 parent 2c9307e
commit d069c7f
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -9,6 +9,8 @@ on:
 
 env:
   SWAGGER_UI_VERSION: 5.17.10
+  COMMIT_ID: "${{ github.event.pull_request.head.sha || github.sha }}"
+  BUILD_VERSION: "0.0_0-dev-${{ github.event.pull_request.head.sha || github.sha }}"
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
@@ -44,7 +46,7 @@ jobs:
         run: |
           /usr/bin/ssh -o StrictHostKeyChecking=no -o LogLevel=quiet ${{ matrix.freebsd_version }}.jaredhendrickson.com 'sudo pkill ntpd || true && sudo ntpdate pool.ntp.org || true'
           /usr/bin/ssh -o StrictHostKeyChecking=no -o LogLevel=quiet ${{ matrix.freebsd_version }}.jaredhendrickson.com 'sudo pkg-static install -y php81-extensions'
-          /usr/local/bin/python3 tools/make_package.py --host ${{ matrix.freebsd_version }}.jaredhendrickson.com --branch ${{ env.commit_id }} --tag ${{ env.build_version }}-${{ matrix.freebsd_id }}
+          /usr/local/bin/python3 tools/make_package.py --host ${{ matrix.freebsd_version }}.jaredhendrickson.com --branch ${{ env.COMMIT_ID }} --tag ${{ env.BUILD_VERSION }}-${{ matrix.freebsd_id }}
 
       - name: Teardown FreeBSD build VM
         if: "${{ always() }}"
@@ -54,8 +56,8 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: pfSense-pkg-RESTAPI-${{ env.build_version }}-${{ matrix.freebsd_id }}.pkg
-          path: pfSense-pkg-RESTAPI-${{ env.build_version }}-${{ matrix.freebsd_id }}.pkg
+          name: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.freebsd_id }}.pkg
+          path: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.freebsd_id }}.pkg
 
   build_openapi:
     runs-on: self-hosted
@@ -69,8 +71,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v3
         with:
-          name: pfSense-pkg-RESTAPI-${{ env.build_version }}-${{ matrix.freebsd_id }}.pkg
-          path: pfSense-pkg-RESTAPI-${{ env.build_version }}-${{ matrix.freebsd_id }}.pkg
+          name: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.freebsd_id }}.pkg
+          path: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.freebsd_id }}.pkg
 
       - name: Setup pfSense VM
         run: |
@@ -84,11 +86,11 @@ jobs:
         run: |
           pfsense-vshell --host ${{ matrix.pfsense_version }}.jaredhendrickson.com -u admin -p pfsense -c 'pfSsh.php playback enablesshd' -k
           pfsense-vshell --host ${{ matrix.pfsense_version }}.jaredhendrickson.com -u admin -p pfsense -c "mkdir /root/.ssh/ && echo $(cat ~/.ssh/id_rsa.pub) > /root/.ssh/authorized_keys" -k
-          scp -o StrictHostKeyChecking=no pfSense-pkg-RESTAPI-${{ env.build_version }}-${{ matrix.freebsd_id }}.pkg/pfSense-pkg-RESTAPI-${{ env.build_version }}-${{ matrix.freebsd_id }}.pkg admin@${{ matrix.pfsense_version }}.jaredhendrickson.com:/tmp/
+          scp -o StrictHostKeyChecking=no pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.freebsd_id }}.pkg/pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.freebsd_id }}.pkg admin@${{ matrix.pfsense_version }}.jaredhendrickson.com:/tmp/
 
       - name: Install pfSense-pkg-RESTAPI on pfSense
         run: |
-          ssh -o StrictHostKeyChecking=no -o LogLevel=quiet admin@${{ matrix.pfsense_version }}.jaredhendrickson.com "pkg -C /dev/null add /tmp/pfSense-pkg-RESTAPI-${{ env.build_version }}-${{ matrix.freebsd_id }}.pkg"
+          ssh -o StrictHostKeyChecking=no -o LogLevel=quiet admin@${{ matrix.pfsense_version }}.jaredhendrickson.com "pkg -C /dev/null add /tmp/pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.freebsd_id }}.pkg"
           sleep 5
 
       - name: Fetch OpenAPI schema from pfSense