Skip to content

Commit

Permalink
gh-actions-pr.yml, gh-actions-release.yml, macos-ci.yml: Omit 2 distr…
Browse files Browse the repository at this point in the history
…os that we no longer support: Debian "buster" and Rocky Linux 8.x
  • Loading branch information
stephengtuggy committed May 2, 2024
1 parent 8c01da1 commit 84f233c
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 44 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/gh-actions-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ jobs:
USE_PYTHON_3: 'ON'
OpenGL_GL_PREFERENCE: 'GLVND'
allow_failure: false
- FROM: 'debian:buster'
COMPILER: 'clang'
USE_PYTHON_3: 'ON'
OpenGL_GL_PREFERENCE: 'GLVND'
allow_failure: false
#- FROM: 'debian:buster'
# COMPILER: 'clang'
# USE_PYTHON_3: 'ON'
# OpenGL_GL_PREFERENCE: 'GLVND'
# allow_failure: false
- FROM: 'opensuse/leap:15.5'
COMPILER: 'clang'
USE_PYTHON_3: 'ON'
Expand Down Expand Up @@ -121,11 +121,11 @@ jobs:
USE_PYTHON_3: 'ON'
OpenGL_GL_PREFERENCE: 'GLVND'
allow_failure: false
- FROM: 'rockylinux/8.7'
COMPILER: 'clang'
USE_PYTHON_3: 'ON'
OpenGL_GL_PREFERENCE: 'GLVND'
allow_failure: false
#- FROM: 'rockylinux/8.7'
# COMPILER: 'clang'
# USE_PYTHON_3: 'ON'
# OpenGL_GL_PREFERENCE: 'GLVND'
# allow_failure: false
- FROM: 'manjarolinux/base'
COMPILER: 'clang'
USE_PYTHON_3: 'ON'
Expand Down
40 changes: 20 additions & 20 deletions .github/workflows/gh-actions-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,16 @@ jobs:
USE_PYTHON_3: 'ON'
OpenGL_GL_PREFERENCE: 'GLVND'
ARTIFACT_EXT: 'deb'
- FROM: 'debian:buster'
COMPILER: 'clang'
USE_PYTHON_3: 'ON'
OpenGL_GL_PREFERENCE: 'LEGACY'
ARTIFACT_EXT: 'deb'
- FROM: 'debian:buster'
COMPILER: 'clang'
USE_PYTHON_3: 'ON'
OpenGL_GL_PREFERENCE: 'GLVND'
ARTIFACT_EXT: 'deb'
#- FROM: 'debian:buster'
# COMPILER: 'clang'
# USE_PYTHON_3: 'ON'
# OpenGL_GL_PREFERENCE: 'LEGACY'
# ARTIFACT_EXT: 'deb'
#- FROM: 'debian:buster'
# COMPILER: 'clang'
# USE_PYTHON_3: 'ON'
# OpenGL_GL_PREFERENCE: 'GLVND'
# ARTIFACT_EXT: 'deb'
- FROM: 'opensuse/leap:15.5'
COMPILER: 'clang'
USE_PYTHON_3: 'ON'
Expand Down Expand Up @@ -156,16 +156,16 @@ jobs:
USE_PYTHON_3: 'ON'
OpenGL_GL_PREFERENCE: 'GLVND'
ARTIFACT_EXT: 'rpm'
- FROM: 'rockylinux:8.7'
COMPILER: 'clang'
USE_PYTHON_3: 'ON'
OpenGL_GL_PREFERENCE: 'LEGACY'
ARTIFACT_EXT: 'rpm'
- FROM: 'rockylinux/8.7'
COMPILER: 'clang'
USE_PYTHON_3: 'ON'
OpenGL_GL_PREFERENCE: 'GLVND'
ARTIFACT_EXT: 'rpm'
#- FROM: 'rockylinux:8.7'
# COMPILER: 'clang'
# USE_PYTHON_3: 'ON'
# OpenGL_GL_PREFERENCE: 'LEGACY'
# ARTIFACT_EXT: 'rpm'
#- FROM: 'rockylinux/8.7'
# COMPILER: 'clang'
# USE_PYTHON_3: 'ON'
# OpenGL_GL_PREFERENCE: 'GLVND'
# ARTIFACT_EXT: 'rpm'

steps:
#- name: Set up Python
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/macos-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,3 @@ jobs:
MY_OS_NAME: macos
FLAGS: '-DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_FIND_APPBUNDLE=LAST'
run: script/cibuild $FLAGS

# - name: Test
# working-directory: ${{github.workspace}}/build
# env:
# GTEST_OUTPUT: xml
# GTEST_COLOR: 1
# run: ctest -V
#
# - name: Upload test results
# uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
# if: failure()
# with:
# name: test_results_xml
# path: ${{github.workspace}}/build/test-results/**/*.xml

0 comments on commit 84f233c

Please sign in to comment.