This is an automated email from the ASF dual-hosted git repository. jdanek pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit df74c0d9cb9b17f1bf7caebbf863c748a38d1bb6 Author: Jiri Daněk <[email protected]> AuthorDate: Wed Mar 9 15:55:46 2022 +0100 NO-JIRA: Speed-up python-checker GHA job (#115) Use Ubuntu directly, and install minimal necessary amount of packages. --- .github/workflows/build.yaml | 88 ++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 36f07a95..fb602275 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -471,6 +471,51 @@ jobs: path: | **/core + python: + name: 'Python Checker (${{ matrix.os }})' + runs-on: '${{ matrix.os }}' + strategy: + matrix: + os: [ 'ubuntu-20.04' ] + + env: + DispatchBuildDir: ${{github.workspace}}/build + InstallPrefix: ${{github.workspace}}/install + DispatchCMakeExtraArgs: > + -GNinja + + steps: + + - name: Add Qpid PPA repository + if: ${{ runner.os == 'Linux' }} + # the `testing` ppa is less likely to be out-of-date + run: | + sudo add-apt-repository ppa:qpid/testing && sudo apt-get update + + - name: Install Linux build dependencies + if: ${{ runner.os == 'Linux' }} + run: | + sudo apt update; sudo apt install -y libqpid-proton-proactor1-dev python3-qpid-proton libpython3-dev ninja-build + + - name: Install python-checker test dependencies + run: python3 -m pip install tox + + - uses: actions/checkout@v2 + + - name: Create Build and Install directories + run: mkdir -p "${DispatchBuildDir}" "{InstallPrefix}" + + - name: qpid-dispatch cmake configure + working-directory: ${{env.DispatchBuildDir}} + run: > + cmake "${{github.workspace}}" \ + "-DCMAKE_INSTALL_PREFIX=${InstallPrefix}" \ + ${DispatchCMakeExtraArgs} + + - name: CTest -R python-checker + working-directory: ${{env.DispatchBuildDir}} + run: ctest -VV -R python-checker + docs: name: 'Docs (${{ matrix.os }})' runs-on: ${{ matrix.os }} @@ -539,49 +584,6 @@ jobs: name: book.pdf path: ${{github.workspace}}/docs/books/user-guide/book.pdf - python: - name: 'Python Checkers (${{ matrix.container }})' - runs-on: '${{ matrix.os }}' - strategy: - matrix: - os: [ 'ubuntu-20.04' ] - container: [ 'fedora' ] - containerTag: [ '35' ] - - container: - image: 'library/${{ matrix.container }}:${{ matrix.containerTag }}' - volumes: - - ${{github.workspace}}:${{github.workspace}} - - env: - DispatchBuildDir: ${{github.workspace}}/build - InstallPrefix: ${{github.workspace}}/install - DispatchCMakeExtraArgs: > - -GNinja - -DCONSOLE_INSTALL=OFF - - steps: - - - name: Install build dependencies - run: | - dnf install -y 'dnf-command(builddep)' && dnf builddep -y qpid-dispatch-router && dnf install -y git tox ninja-build - - - uses: actions/checkout@v2 - - - name: Create Build and Install directories - run: mkdir -p "${DispatchBuildDir}" "{InstallPrefix}" - - - name: qpid-dispatch cmake configure - working-directory: ${{env.DispatchBuildDir}} - run: > - cmake "${{github.workspace}}" \ - "-DCMAKE_INSTALL_PREFIX=${InstallPrefix}" \ - ${DispatchCMakeExtraArgs} - - - name: CTest -R python-checker - working-directory: ${{env.DispatchBuildDir}} - run: ctest -VV -R python-checker - console-test: name: Console Tests runs-on: ubuntu-latest --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
