From 51fcbfd12c1f0a32b0d8b8e82b8c2f814ef8829b Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 22 Aug 2024 20:45:58 +0200 Subject: [PATCH 1/3] Integrate antsibull-docutils into CI. --- .github/workflows/antsibull-build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/antsibull-build.yml b/.github/workflows/antsibull-build.yml index d66e7ce062..b4b00e2862 100644 --- a/.github/workflows/antsibull-build.yml +++ b/.github/workflows/antsibull-build.yml @@ -53,6 +53,13 @@ jobs: ref: main path: antsibull-changelog + - name: Check out antsibull-docutils + uses: actions/checkout@v4 + with: + repository: ansible-community/antsibull-docutils + ref: main + path: antsibull-docutils + - name: Pre-create build directory run: mkdir -p antsibull/build From 3bf852ae3ee0aa697fb7128c9227264ca93ebec1 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 22 Aug 2024 20:46:24 +0200 Subject: [PATCH 2/3] Clean up nox workflow. --- .github/workflows/nox.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nox.yml b/.github/workflows/nox.yml index a6ac83ec79..faa3bafb76 100644 --- a/.github/workflows/nox.yml +++ b/.github/workflows/nox.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: antsibull + working-directory: ansible-build-data strategy: fail-fast: false matrix: @@ -31,17 +31,17 @@ jobs: python-versions: "3.12" name: "Run nox ${{ matrix.session }} session" steps: - - name: Check out antsibull + - name: Check out ansible-build-data uses: actions/checkout@v4 with: - path: antsibull + path: ansible-build-data - name: Setup nox uses: wntrblm/nox@2024.04.15 with: python-versions: "${{ matrix.python-versions }}" - name: Set up nox environments run: | - OTHER_ANTSIBULL_MODE=git nox -v -e "${{ matrix.session }}" ${{ matrix.codecov && 'coverage' || '' }} --install-only + nox -v -e "${{ matrix.session }}" ${{ matrix.codecov && 'coverage' || '' }} --install-only - name: "Run nox -e ${{ matrix.session }}" run: | - OTHER_ANTSIBULL_MODE=git nox -v -e "${{ matrix.session }}" --reuse-existing-virtualenvs --no-install + nox -v -e "${{ matrix.session }}" --reuse-existing-virtualenvs --no-install From df5b2b520f29b090d6856296f4467371cee6c47b Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 22 Aug 2024 21:54:17 +0200 Subject: [PATCH 3/3] Remove unnecessary expression. Co-authored-by: Maxwell G --- .github/workflows/nox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nox.yml b/.github/workflows/nox.yml index faa3bafb76..8b8bccad96 100644 --- a/.github/workflows/nox.yml +++ b/.github/workflows/nox.yml @@ -41,7 +41,7 @@ jobs: python-versions: "${{ matrix.python-versions }}" - name: Set up nox environments run: | - nox -v -e "${{ matrix.session }}" ${{ matrix.codecov && 'coverage' || '' }} --install-only + nox -v -e "${{ matrix.session }}" --install-only - name: "Run nox -e ${{ matrix.session }}" run: | nox -v -e "${{ matrix.session }}" --reuse-existing-virtualenvs --no-install