diff options
| author | Bill Traynor <btraynor@gmail.com> | 2022-07-26 12:35:27 -0400 |
|---|---|---|
| committer | Bill Traynor <btraynor@gmail.com> | 2022-07-26 12:36:28 -0400 |
| commit | c3bc2b01f309707ebda480b57b72201e0bfb1e58 (patch) | |
| tree | f2ebed7b240dde00d00be164c688fe9b56fc0a80 /.github | |
| parent | e6deeb1fa985dd29860dad43b06f03c85b4b8142 (diff) | |
| parent | 10eea63205f371ed649355f4cf7a80716335958f (diff) | |
| download | riscv-isa-manual-c3bc2b01f309707ebda480b57b72201e0bfb1e58.zip riscv-isa-manual-c3bc2b01f309707ebda480b57b72201e0bfb1e58.tar.gz riscv-isa-manual-c3bc2b01f309707ebda480b57b72201e0bfb1e58.tar.bz2 | |
Merge branch 'master' into convert2adoc
Fixing github action.
Signed-off-by: Bill Traynor <wmat@riscv.org>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build-pdf.yml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.github/workflows/build-pdf.yml b/.github/workflows/build-pdf.yml index 13e8d6f..e6e095a 100644 --- a/.github/workflows/build-pdf.yml +++ b/.github/workflows/build-pdf.yml @@ -1,4 +1,7 @@ <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> master # This workflow installs dependencies for PDF generation, generates the PDF, # and uploads the PDF as an artifact. @@ -21,6 +24,7 @@ jobs: BUNDLE_BIN: ${{ github.workspace }}/bin NPM_PACKAGE_FOLDER: ${{ github.workspace }}/dependencies PDF_RESULT: unpriv-isa-asciidoc.pdf + if: contains(github.ref, "convert2adoc") steps: - uses: actions/checkout@v2 - name: Install Ubuntu packages @@ -57,6 +61,7 @@ jobs: name: ${{ env.PDF_RESULT }} path: ./build/${{ env.PDF_RESULT }} retention-days: 7 +<<<<<<< HEAD ======= name: Build Document PDF @@ -68,3 +73,5 @@ jobs: steps: - name: DummyStep >>>>>>> 4e61dfb (add dummy GitHub action (#802)) +======= +>>>>>>> master |