From 6c322998ab365e5d482c2f7c1916f4bc31b12052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Wed, 8 Jun 2022 18:08:17 +0200 Subject: [PATCH 1/3] Build the docs for the 6.0 branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 00d3acf2bc..557513d0b0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -37,4 +37,4 @@ jobs: fail-fast: false matrix: release: [pip] - branch: ['develop', '5.7'] + branch: ['develop', '5.7', '6.0'] From a28dd61511cf8da9c75cb0ecb0978f76d44c9199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Wed, 8 Jun 2022 18:10:26 +0200 Subject: [PATCH 2/3] Also build docs on pushes to 6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- .github/workflows/docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 557513d0b0..63b9db8dd1 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -4,6 +4,7 @@ on: branches: - develop - '5.7' + - '6.0' paths: - docs/** From 7cd5fe0f64e666fe13c85df33d43147e6a851380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Wed, 8 Jun 2022 18:24:29 +0200 Subject: [PATCH 3/3] Only build the docs in the branch that has been pushed to MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- .github/workflows/docs.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 63b9db8dd1..b33547d3ee 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,7 +2,7 @@ on: workflow_dispatch: push: branches: - - develop + - 'develop' - '5.7' - '6.0' paths: @@ -19,23 +19,18 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - with: - ref: ${{ matrix.branch }} - name: Install deps run: pip install click sphinx sqlalchemy_schemadisplay - name: Build the docs - run: devel/ci/bodhi-ci docs -r ${{ matrix.release }} - + run: devel/ci/bodhi-ci docs -r pip + - name: Deploy uses: JamesIves/github-pages-deploy-action@v4.2.5 with: branch: gh-pages - folder: test_results/${{ matrix.release }}-docs/html - target-folder: ${{ matrix.branch }} + folder: test_results/pip-docs/html + target-folder: ${{ env.GITHUB_REF_NAME }} strategy: fail-fast: false - matrix: - release: [pip] - branch: ['develop', '5.7', '6.0']