From 78ce6d6b09854da0bcde92849fdb9e8a6842bbdb Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Thu, 10 Nov 2022 14:31:58 -0800
Subject: [PATCH] merge docs build into release

---
 .github/workflows/release.yml | 41 ++++++++---------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6abb007fa..5ae0242d9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,36 +11,6 @@ jobs:
       matrix:
         python-version: ["3.9"]
 
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "pip"
-          cache-dependency-path: '**/setup.py'
-
-      - name: Build package
-        run: |
-          python${{ matrix.python-version }} -m pip install --upgrade pip pip-tools build setuptools setuptools_scm wheel
-          python${{ matrix.python-version }} -m build
-
-      - name: Publish package
-        uses: pypa/gh-action-pypi-publish@release/v1.5
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_TOKEN }}
-
-  docs:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-    needs:
-      - deploy
-
     steps:
       - uses: actions/checkout@v3
         with:
@@ -54,13 +24,14 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python${{ matrix.python-version }} -m pip install --upgrade pip pip-tools setuptools_scm
+          python${{ matrix.python-version }} -m pip install --upgrade pip pip-tools build setuptools setuptools_scm wheel
           python${{ matrix.python-version }} -m piptools sync --user requirements/ubuntu-latest_py${{ matrix.python-version }}_extras.txt
           # Using non-editable install for testing building of MANIFEST files
           python${{ matrix.python-version }} -m pip install --no-deps .
 
-      - name: Build
+      - name: Build package and docs
         run: |
+          python${{ matrix.python-version }} -m build
           cd docs_rst
           python${{ matrix.python-version }} featurizer_summary.py > featurizer_summary.rst
           python${{ matrix.python-version }} dataset_summary.py > dataset_summary.rst
@@ -75,3 +46,9 @@ jobs:
           git add .
           git commit -a -m "update docs"
           git push
+
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1.5
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_TOKEN }}