Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Couple of CI improvements #468

Merged
merged 3 commits into from
Jul 24, 2022
Merged

Couple of CI improvements #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c14e738
ci: pr-test: install libxcb-image0 on ubuntu runner
rokm Jul 23, 2022
9a1654a
ci: oneshot-test & pr-test: enable colored output
rokm Jul 23, 2022
5d8ead2
ci: oneshot-test & pr-test: rebuild PyInstaller's bootloader
rokm Jul 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/oneshot-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ on:
Use ';' to separate multiple commands.
required: false

env:
# Colored pytest output on CI despite not having a tty
FORCE_COLOR: 1

jobs:
generate-matrix:
# Parse inputs into a json containing the matrix that will parametrize the
Expand Down Expand Up @@ -105,6 +109,10 @@ jobs:
# There doesn't seem to be a nice function to cast 'true' to true.
fail-fast: ${{ github.event.inputs.fail-fast == 'true' }}

env:
# Rebuild bootloader when installing PyInstaller from develop branch
PYINSTALLER_COMPILE_BOOTLOADER: 1

# Finally, the usual: setup Python, install dependencies, test.
steps:
- uses: actions/checkout@v2
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/pr-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
paths:
- requirements-test-libraries.txt

env:
# Colored pytest output on CI despite not having a tty
FORCE_COLOR: 1

jobs:
test:
runs-on: ${{ matrix.os }}
Expand All @@ -17,6 +21,11 @@ jobs:
pyinstaller: ["https://github.com/pyinstaller/pyinstaller/archive/develop.zip"]
os: ["macos-latest", "ubuntu-latest", "windows-latest"]
fail-fast: false

env:
# Rebuild bootloader when installing PyInstaller from develop branch
PYINSTALLER_COMPILE_BOOTLOADER: 1

steps:
- uses: actions/checkout@v2

Expand Down Expand Up @@ -67,7 +76,7 @@ jobs:
sudo apt-get install libxcb-xkb-dev xvfb
Xvfb :99 & echo "DISPLAY=:99" >> $GITHUB_ENV
# Install PyQt5 (qtmodern) dependencies.
sudo apt-get install -y libxcb-keysyms1 libxcb-render-util0 \
sudo apt-get install -y libxcb-image0 libxcb-keysyms1 libxcb-render-util0 \
libxkbcommon-x11-0 libxcb-icccm4 libxcb1 openssl \
libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev \
libxcb-shape0-dev libxcb-xkb-dev libopengl0 libegl1 \
Expand Down