From d9e07b40ecd2adee150ac48da66e952bcdefcb03 Mon Sep 17 00:00:00 2001 From: Matthias Wittgen Date: Sat, 4 Jun 2022 10:50:03 -0700 Subject: [PATCH 1/3] Add reusable workflow for build_docs --- .github/workflows/build_docs.yaml | 51 ++++--------------------------- build_docs.ini | 6 ++++ 2 files changed, 12 insertions(+), 45 deletions(-) create mode 100644 build_docs.ini diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml index 0d0b666dd1..a4253ac4b0 100644 --- a/.github/workflows/build_docs.yaml +++ b/.github/workflows/build_docs.yaml @@ -1,4 +1,4 @@ -name: docs +name: Build docs on: push: @@ -7,47 +7,8 @@ on: pull_request: jobs: - build_sphinx_docs: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - # Need to clone everything for the git tags. - fetch-depth: 0 - - - name: Set up Python - uses: actions/setup-python@v3 - with: - python-version: '3.10' - cache: "pip" - cache-dependency-path: "setup.cfg" - - - name: Install sqlite - run: sudo apt-get install sqlite libyaml-dev - - - name: Update pip/wheel infrastructure - run: | - python -m pip install --upgrade pip - pip install wheel - - - name: Install postgresql (server) - run: | - sudo apt-get update - sudo apt-get install postgresql - - - name: Install postgresql Python packages - run: pip install psycopg2 testing.postgresql - - - name: Install dependencies - run: | - pip install -r requirements.txt - - - name: Build and install - run: pip install -v . - - - name: Install documenteer - run: pip install 'documenteer[pipelines]<0.7' - - - name: Build documentation - working-directory: ./doc - run: package-docs build + call-workflow: + uses: lsst/rubin_workflows/.github/workflows/build_docs.yaml@tickets/DM-35133 + with: + - ubuntu_deps: "postgresql sqlite libyaml-dev" + - pip_deps: "psycopg2 testing.postgresql" diff --git a/build_docs.ini b/build_docs.ini new file mode 100644 index 0000000000..3bd70075b7 --- /dev/null +++ b/build_docs.ini @@ -0,0 +1,6 @@ +# Ubuntu packages required for build_docs workflow +[ubuntu] +install = postgresql sqlite libyaml-dev +# pip install packages required for build_docs workflow +[pip] +install = psycopg2 testing.postgresql From 3ba34b06ef4da4b6f6eb27a0694441e2ea28bd69 Mon Sep 17 00:00:00 2001 From: Matthias Wittgen Date: Sun, 14 Aug 2022 12:22:45 -0700 Subject: [PATCH 2/3] don't use ini files for cmake/build_docs workflow --- .github/workflows/build_docs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml index a4253ac4b0..b7b76d3f46 100644 --- a/.github/workflows/build_docs.yaml +++ b/.github/workflows/build_docs.yaml @@ -10,5 +10,5 @@ jobs: call-workflow: uses: lsst/rubin_workflows/.github/workflows/build_docs.yaml@tickets/DM-35133 with: - - ubuntu_deps: "postgresql sqlite libyaml-dev" - - pip_deps: "psycopg2 testing.postgresql" + ubuntu_deps: "postgresql sqlite libyaml-dev" + pip_deps: "psycopg2 testing.postgresql" From 97bae8efbb9c31761a93ab25388cafb9e6409010 Mon Sep 17 00:00:00 2001 From: Matthias Wittgen Date: Mon, 15 Aug 2022 11:53:54 -0700 Subject: [PATCH 3/3] Don't use ini files for cmake/build_docs workflow --- build_docs.ini | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 build_docs.ini diff --git a/build_docs.ini b/build_docs.ini deleted file mode 100644 index 3bd70075b7..0000000000 --- a/build_docs.ini +++ /dev/null @@ -1,6 +0,0 @@ -# Ubuntu packages required for build_docs workflow -[ubuntu] -install = postgresql sqlite libyaml-dev -# pip install packages required for build_docs workflow -[pip] -install = psycopg2 testing.postgresql