diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml index e5d7d1264..99afb99d4 100644 --- a/.github/workflows/gh-actions-pr.yml +++ b/.github/workflows/gh-actions-pr.yml @@ -116,11 +116,11 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' allow_failure: false - - FROM: 'rockylinux:8.9' - COMPILER: 'clang' - OpenGL_GL_PREFERENCE: 'GLVND' - ENABLE_PIE: 'ON' - allow_failure: false + #- FROM: 'rockylinux:8.9' + # COMPILER: 'clang' + # OpenGL_GL_PREFERENCE: 'GLVND' + # ENABLE_PIE: 'ON' + # allow_failure: false #- FROM: 'manjarolinux/base' # COMPILER: 'clang' # OpenGL_GL_PREFERENCE: 'LEGACY' diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml index bf3bef58b..0cff70cbc 100644 --- a/.github/workflows/gh-actions-release.yml +++ b/.github/workflows/gh-actions-release.yml @@ -91,11 +91,11 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' ARTIFACT_EXT: 'rpm' - - FROM: 'rockylinux:8.9' - COMPILER: 'clang' - OpenGL_GL_PREFERENCE: 'GLVND' - ENABLE_PIE: 'ON' - ARTIFACT_EXT: 'rpm' + #- FROM: 'rockylinux:8.9' + # COMPILER: 'clang' + # OpenGL_GL_PREFERENCE: 'GLVND' + # ENABLE_PIE: 'ON' + # ARTIFACT_EXT: 'rpm' steps: - name: Check out repository diff --git a/script/bootstrap-on-macos.sh b/script/bootstrap-on-macos.sh index 9b8177240..0058c4128 100644 --- a/script/bootstrap-on-macos.sh +++ b/script/bootstrap-on-macos.sh @@ -38,7 +38,7 @@ brew update for j in "${packages_to_install[@]}" do - brew install "$j" + brew list "$j" &>/dev/null || brew install "$j" PACKAGE_INSTALLED_PREFIX=$(brew --prefix "$j") PACKAGE_INSTALLED_BIN="$PACKAGE_INSTALLED_PREFIX/bin" export PATH="$PACKAGE_INSTALLED_BIN:$PATH" @@ -47,5 +47,5 @@ done ln -s /usr/local/include/GL /usr/local/include/OpenGL ln -s /usr/local/include/GL /usr/local/include/GLUT -OPENALDIR=$(brew --prefix openal-soft) +OPENALDIR="$(brew --prefix openal-soft)" export OPENALDIR diff --git a/script/brew-install-for-cmake.sh b/script/brew-install-for-cmake.sh old mode 100644 new mode 100755