move all to a script

acts-project · Dec 13, 2024 · 1573b51 · 1573b51
1 parent e079196
commit 1573b51
Show file tree

Hide file tree

Showing 8 changed files with 144 additions and 253 deletions.
diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml
diff --git a/.github/actions/dependencies/detect_os.sh b/.github/actions/dependencies/detect_os.sh
diff --git a/.github/actions/dependencies/with_spack_env.sh b/.github/actions/dependencies/with_spack_env.sh
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -37,7 +37,7 @@ jobs:
           lfs: true
 
       - name: Install dependencies
-        uses: ./.github/actions/dependencies
+        uses: CI/dependencies/setup.sh
 
       - run: env
       - run: |
@@ -273,7 +273,7 @@ jobs:
           lfs: true
 
       - name: Install dependencies
-        uses: ./.github/actions/dependencies
+        uses: CI/dependencies/setup.sh
   #
   #     - name: Restore ccache
   #       uses: actions/cache/restore@v4
@@ -352,7 +352,7 @@ jobs:
       #     && CI/dependencies.sh
 
       - name: Install dependencies
-        uses: ./.github/actions/dependencies
+        uses: CI/dependencies/setup.sh
   #
   #     - name: Restore ccache
   #       uses: actions/cache/restore@v4

diff --git a/CI/dependencies.sh b/CI/dependencies.sh
diff --git a/.github/actions/dependencies/opengl.sh → CI/dependencies/opengl.sh b/.github/actions/dependencies/opengl.sh → CI/dependencies/opengl.sh
@@ -3,11 +3,7 @@
 set -u
 set -e
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-source ${SCRIPT_DIR}/detect_os.sh
-
-packages_file=${GITHUB_WORKSPACE}/spack/etc/spack/packages.yaml
+packages_file=$(spack location -r)/spack/etc/spack/packages.yaml
 
 if ! command -v sudo &> /dev/null
 then
@@ -16,8 +12,9 @@ else
     SUDO="sudo"
 fi
 
+os=$(spack arch --platform)
 
-if [ "$os" == "ubuntu" ]; then
+if [ "$os" == ubuntu* ]; then
   ${SUDO} apt-get update
   ${SUDO} apt-get install -y libgl1-mesa-dev
 cat <<EOF > "$packages_file"
@@ -29,7 +26,7 @@ packages:
       spec: [email protected]
 EOF
 cat "$packages_file"
-elif [ "$os" == "almalinux" ]; then
+elif [ "$os" == almalinux* ]; then
   ${SUDO} dnf install -y mesa-libGLU
 cat <<EOF > "$packages_file"
 packages:

diff --git a/.github/actions/dependencies/parallel.sh → CI/dependencies/parallel.sh b/.github/actions/dependencies/parallel.sh → CI/dependencies/parallel.sh