Update bootstrap-on-macos.sh and brew-install-for-cmake.sh. Also comm…

…ent out Rocky Linux 8.9 CI builds for now.
vegastrike · Apr 25, 2024 · 46109c3 · 46109c3
1 parent 1fe5972
commit 46109c3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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