workflows: set 'pdf-name' to match PDF output

riscvarchive · Dec 5, 2022 · e05301d · e05301d
1 parent 869cee3
commit e05301d
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/.github/workflows/build-pdf.yml b/.github/workflows/build-pdf.yml
@@ -31,19 +31,23 @@ jobs:
       BUNDLE_BIN: ${{ github.workspace }}/bin
       NPM_PACKAGE_FOLDER: ${{ github.workspace }}/dependencies
     outputs:
+      tag: ${{ steps.git_describe.outputs.tag }}
       name: ${{ steps.step1.outputs.name }}
       pdf-name: ${{ steps.step2.outputs.pdf-name }}
     steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        submodules: 'true'
+    - name: GIT describe
+      id: git_describe
+      run: echo "::set-output name=tag::$(git describe --tag --always --dirty)"
     - name: Set outputs.name
       id: step1
       run: echo "::set-output name=name::$NAME"
     - name: Set outputs.pdf-name
       id: step2
-      run: echo "::set-output name=pdf-name::$NAME.pdf"
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        submodules: 'true'
+      run: echo "::set-output name=pdf-name::${{ env.NAME }}-${{ steps.git_describe.outputs.tag }}.pdf"
     - name: Install Ubuntu packages
       run: |
         sudo apt-get update
@@ -71,9 +75,6 @@ jobs:
       run: |
         PATH=${PATH}:${BUNDLE_BIN}:$(npm bin) \
         make
-    - name: GIT describe
-      id: git_describe
-      run: echo "::set-output name=tag::$(git describe --tag --always --dirty)"
     - name: Archive PDF result
       uses: actions/upload-artifact@v2
       with: