Skip to content

Commit

Permalink
Merge pull request #3 from lsst-pst/u/timj/modernize-build
Browse files Browse the repository at this point in the history
Modernize build system to current standard
  • Loading branch information
timj authored Apr 3, 2024
2 parents 7398f1b + 579ca2a commit 533e64f
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 43 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: CI

"on": [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # full history for metadata
submodules: true

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.10"

- name: Python install
run: |
python -m pip install --upgrade pip
python -m pip install "lander<2.0.0"
- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: sqrereadonly
password: ${{ secrets.DOCKERHUB_SQREREADONLY_TOKEN }}

- name: TeX build
run: |
docker run --rm -v `pwd`:/workspace -w /workspace lsstsqre/lsst-texmf:latest sh -c 'make'
- name: Landing page upload
if: ${{ github.event_name == 'push' }}
env:
LTD_PASSWORD: ${{ secrets.LTD_PASSWORD }}
LTD_USERNAME: ${{ secrets.LTD_USERNAME }}
run: |
lander --upload --pdf PSTN-019.pdf --lsstdoc PSTN-019.tex --ltd-product pstn-019
36 changes: 0 additions & 36 deletions .travis.yml

This file was deleted.

8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,11 @@ endif

export TEXMFHOME ?= lsst-texmf/texmf

$(DOCNAME).pdf: $(tex) meta.tex local.bib authors.tex acronyms.tex
$(DOCNAME).pdf: $(tex) meta.tex local.bib authors.tex
latexmk -bibtex -xelatex -f $(DOCNAME)

# Acronym tool allows for selection of acronyms based on tags - you may want more than DM
acronyms.tex: $(tex) myacronyms.txt
$(TEXMFHOME)/../bin/generateAcronyms.py -t "DM" $(tex)

authors.tex: authors.yaml
python3 $(TEXMFHOME)/../bin/db2authors.py > authors.tex
python3 $(TEXMFHOME)/../bin/db2authors.py > authors.tex

.PHONY: clean
clean:
Expand Down
2 changes: 1 addition & 1 deletion lsst-texmf
Submodule lsst-texmf updated 91 files
+0 −3 .dockerignore
+6 −0 .flake8
+119 −0 .github/workflows/ci.yaml
+41 −0 .github/workflows/dockercache.yaml
+71 −0 .github/workflows/generatebib.yaml
+7 −0 .github/workflows/rebase_checker.yaml
+25 −0 .github/workflows/yamllint.yaml
+6 −0 .gitignore
+28 −0 .pre-commit-config.yaml
+0 −45 .travis.yml
+19 −0 .yamllint.yaml
+40 −14 Dockerfile
+30 −6 Makefile
+13 −4 README.md
+97 −0 bin/bibtools.py
+197 −17 bin/db2authors.py
+449 −152 bin/generateAcronyms.py
+217 −0 bin/generateBibfile.py
+78 −72 bin/lsstdoc2bib.py
+246 −0 bin/makeTablesFromGoogle.py
+112 −0 bin/showBeamerThemes
+81 −0 bin/tests/test_bibentry.py
+0 −36 bin/travis-docker-deploy.sh
+31 −0 bin/validate_authors.py
+5 −9 bin/validate_bib.py
+6 −0 docker/01_nodoc
+54 −0 docker/install-base-packages.sh
+1 −0 docs/Makefile
+1 −1 docs/README.rst
+14 −38 docs/conf.py
+19 −3 docs/developer.rst
+18 −11 docs/docker.rst
+15 −0 docs/examples/MEMO-nnn.rst
+10 −0 docs/examples/glossary-table.rst
+3 −0 docs/examples/index.rst
+1 −0 docs/index.rst
+71 −10 docs/lsstdoc.rst
+75 −0 docs/overleaf.rst
+3 −3 docs/requirements.txt
+60 −3 docs/submodule.rst
+8 −113 docs/templates/document.rst
+2 −2 docs/templates/index.rst
+1,840 −130 etc/authordb.yaml
+108 −0 etc/glossary.html
+1,600 −711 etc/glossarydefs.csv
+1,581 −0 etc/glossarydefs_es.csv
+1,958 −0 etc/static_entries.bib
+30 −0 examples/MEMO-nnn.tex
+10 −12 examples/acronyms.tex
+41 −0 examples/glossary-table.tex
+10 −0 requirements.txt
+0 −4 setup.cfg
+0 −11 templates/document/README.rst
+0 −40 templates/document/cookiecutter.json
+0 −181 templates/document/{{cookiecutter.series.lower()}}-{{cookiecutter.serial_number}}/.gitignore
+0 −17 templates/document/{{cookiecutter.series.lower()}}-{{cookiecutter.serial_number}}/.travis.yml
+0 −31 templates/document/{{cookiecutter.series.lower()}}-{{cookiecutter.serial_number}}/Makefile
+0 −30 templates/document/{{cookiecutter.series.lower()}}-{{cookiecutter.serial_number}}/README.rst
+0 −8 templates/document/{{cookiecutter.series.lower()}}-{{cookiecutter.serial_number}}/body.tex
+0 −4 templates/document/{{cookiecutter.series.lower()}}-{{cookiecutter.serial_number}}/myacronyms.txt
+0 −12 templates/document/{{cookiecutter.series.lower()}}-{{cookiecutter.serial_number}}/skipacronyms.txt
+0 −78 ...lower()}}-{{cookiecutter.serial_number}}/{{cookiecutter.series.upper()}}-{{cookiecutter.serial_number}}.tex
+12 −0 texmf/bibtex/bib/books.bib
+1,487 −0 texmf/bibtex/bib/ivoa.bib
+57 −5 texmf/bibtex/bib/lsst-dm.bib
+9,277 −1,021 texmf/bibtex/bib/lsst.bib
+133 −0 texmf/bibtex/bib/refs.bib
+523 −17 texmf/bibtex/bib/refs_ads.bib
+1,775 −0 texmf/bibtex/bst/asp2014.bst
+34 −2 texmf/ls-R
+2 −0 texmf/tex/LSST-themes/DESC/LSSToptions.tex
+118 −0 texmf/tex/LSST-themes/LSST2016-alt/LSSToptions.tex
+2 −0 texmf/tex/LSST-themes/LSST2016/LSSToptions.tex
+0 −0 texmf/tex/LSST-themes/LSST2017-43/LSSToptions.tex
+1 −0 texmf/tex/LSST-themes/LSST2017-nologos/LSSToptions.tex
+1 −0 texmf/tex/LSST-themes/LSST2017/LSSToptions.tex
+ texmf/tex/LSST-themes/Rubin/LSSTcover.pdf
+ texmf/tex/LSST-themes/Rubin/LSSTmain-SLAC.pdf
+ texmf/tex/LSST-themes/Rubin/LSSTmain-aura.pdf
+ texmf/tex/LSST-themes/Rubin/LSSTmain.pdf
+4 −0 texmf/tex/LSST-themes/Rubin/LSSToptions.tex
+1 −1 texmf/tex/LSST-themes/default
+1 −0 texmf/tex/LSST-themes/generic/LSSToptions.tex
+1,372 −0 texmf/tex/latex/conf/asp2014.sty
+78 −4 texmf/tex/latex/lsst/LSST-beamer.sty
+0 −192 texmf/tex/latex/lsst/lsstbeamer.cls
+150 −77 texmf/tex/latex/lsst/lsstdoc.cls
+ texmf/tex/latex/lsst/rubin_logo.png
+ texmf/tex/latex/lsst/rubinobs.png
+952 −0 texmf/tex/latex/tocstyle/tocstyle.sty
+1 −0 ups/lsst_texmf.table

0 comments on commit 533e64f

Please sign in to comment.