diff options
| author | drowe67 <[email protected]> | 2023-12-13 18:19:08 +1030 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-13 18:19:08 +1030 |
| commit | cdd51b01a0c68606221582dcd0e024f96975d439 (patch) | |
| tree | 5bb56f62aa398f61b2cdfdf7a84b13b434e35922 | |
| parent | 93dbb6290495ccb194759506372b72fac1b1b104 (diff) | |
| parent | ecbeb0aa47f8a1e29bb462cea9d90e5eb2cb6978 (diff) | |
Merge pull request #39 from drowe67/ms-ctest-doc
Fix issue preventing documentation ctest from executing in GitHub environment.
| -rw-r--r-- | .github/workflows/cmake.yml | 4 | ||||
| -rw-r--r-- | doc/Makefile | 6 | ||||
| -rw-r--r-- | doc/codec2.tex | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 7e76b65..df02ee2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -21,7 +21,7 @@ jobs: shell: bash run: | sudo apt-get update - sudo apt-get install octave octave-common octave-signal liboctave-dev gnuplot sox p7zip-full python3-numpy valgrind clang-format + sudo apt-get install octave octave-common octave-signal liboctave-dev gnuplot sox p7zip-full python3-numpy valgrind clang-format texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra texlive-science texmaker texlive-bibtex-extra - name: Create Build Directory shell: bash @@ -50,7 +50,7 @@ jobs: - name: Run ctests working-directory: ${{github.workspace}}/build_linux shell: bash - run: ctest --output-on-failure -E test_codec2_doc + run: ctest --output-on-failure - name: Test library installation working-directory: ${{github.workspace}}/build_linux diff --git a/doc/Makefile b/doc/Makefile index 659d4f6..5d05ea4 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -20,10 +20,10 @@ PATH := $(PATH):$(CODEC2_BINARY)/src PLOT_FILES := hts2a_37_sn.tex hts2a_37_sw.tex hts2a_37_lpc_lsp.tex hts2a_37_lpc_pf.tex $(DOCNAME).pdf: $(PLOT_FILES) $(DOCNAME).tex $(DOCNAME)_refs.bib - pdflatex -jobname=$(JOBNAME) $(DOCNAME).tex + pdflatex -shell-escape -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex bibtex $(JOBNAME).aux - pdflatex -jobname=$(JOBNAME) $(DOCNAME).tex - pdflatex -jobname=$(JOBNAME) $(DOCNAME).tex + pdflatex -shell-escape -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex + pdflatex -shell-escape -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex $(PLOT_FILES): echo $(PATH) diff --git a/doc/codec2.tex b/doc/codec2.tex index 27181a2..89218fa 100644 --- a/doc/codec2.tex +++ b/doc/codec2.tex @@ -9,14 +9,14 @@ \usepackage{catchfile} \usepackage{siunitx} -\CatchFileDef{\headfull}{../.git/HEAD}{} -\StrGobbleRight{\headfull}{1}[\head] -\StrBehind[2]{\head}{/}[\branch] -\IfFileExists{../.git/refs/heads/\branch}{% - \CatchFileDef{\commit}{../.git/refs/heads/\branch}{}}{% - \newcommand{\commit}{\dots~(in \emph{packed-refs})}} \newcommand{\gitrevision}{% - \StrLeft{\commit}{7}% + \immediate\write18{git log -n1 --oneline | awk '{print $1;}' > gitrevision.txt} + \input{gitrevision.txt} +} + +\newcommand{\branch}{% + \immediate\write18{git branch --show-current > gitbranch.txt} + \input{gitbranch.txt} } \title{Codec 2} |