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.

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

MAINT: 24.04 compat #18

Merged
merged 1 commit into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-14, macos-13, ubuntu-latest, ubuntu-20.04, windows-2019, windows-2022]
os: [macos-14, macos-13, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-2019, windows-2022]
qt: [""]
include:
- os: ubuntu-latest
Expand Down
25 changes: 14 additions & 11 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,21 @@ branding:
runs:
using: "composite"
steps:
- name: Install Linux dependencies
- name: Update apt
if: runner.os == 'Linux'
shell: bash
# TODO: Pyvista uses `xset` which is part of x11-xserver-utils, maybe a better way to check?
run: sudo apt update && sudo apt install libgl1-mesa-glx xvfb x11-xserver-utils -y
run: sudo apt update

- name: Install Linux dependencies
if: runner.os == 'Linux'
shell: bash
run: |
sudo apt-get install -y \
libglx-mesa0 \
libgl1 \
xvfb \
x11-xserver-utils

- name: Install Linux Qt dependencies
if: runner.os == 'Linux' && inputs.qt != 'false'
Expand Down Expand Up @@ -64,14 +74,7 @@ runs:
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
sleep 3

- name: Configure for PyVista on Linux and macOS
if: runner.os != 'Windows' && inputs.pyvista != 'false'
- name: Configure for PyVista
if: inputs.pyvista != 'false'
shell: bash
run: echo "PYVISTA_OFF_SCREEN=true" >> $GITHUB_ENV

- name: Configure for PyVista on Windows
if: runner.os == 'Windows' && inputs.pyvista != 'false'
shell: powershell
run: |
chcp 65001 #set code page to utf-8
echo "PYVISTA_OFF_SCREEN=true" >> $env:GITHUB_ENV
10 changes: 0 additions & 10 deletions linux/setup.sh

This file was deleted.