Fix quadruple quoting

pdidev · Jul 5, 2024 · df03839 · df03839
1 parent 38cba85
commit df03839
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/spack_docker_images.yml b/.github/workflows/spack_docker_images.yml
@@ -54,7 +54,7 @@ jobs:
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/2b-compiler
-        swap: 10G
+        swap: 15G
         image-name: builder:${{ matrix.version }}-${{ matrix.compiler }}-2b
         build-args: |
           VERSION=${{ matrix.version }}
@@ -109,7 +109,7 @@ jobs:
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/3b-compiler
-        swap: 10G
+        swap: 15G
         image-name: builder:${{ matrix.version }}-${{ matrix.compiler }}-3b
         build-args: |
           VERSION=${{ matrix.version }}

diff --git a/spack/2b-compiler/Dockerfile b/spack/2b-compiler/Dockerfile
@@ -20,8 +20,8 @@ RUN spack solve -I --reuse "$(cat compilerpkg.lst)" target=x86_64 \
 
 
 # Workaround clang 14.0.2 that reports version as 14.0.1
-RUN spack find -v --no-groups  ""$(cat compilerpkg.lst)"" > compilerpkg.lst \
- && spack find --no-groups  ""$(cat compilerpkg.lst)"" > compiler.lst \
+RUN spack find -v --no-groups  "$(cat compilerpkg.lst)" > compilerpkg.lst \
+ && spack find --no-groups  "$(cat compilerpkg.lst)" > compiler.lst \
  && sed 's/llvm/clang/' -i compiler.lst \
  && sed 's/[email protected]/[email protected]/' -i compiler.lst \
  && spack clean -a
@@ -33,7 +33,7 @@ RUN spack compiler remove --scope site -a gcc || true \
  && spack compiler remove -a clang || true \
  && spack compiler remove -a gcc || true \
  && spack compiler find --scope site \
-          "$(spack find --format '{name}' --paths ""$(cat compilerpkg.lst)"" | awk '{print $2}')" \
+          "$(spack find --format '{name}' --paths "$(cat compilerpkg.lst)" | awk '{print $2}')" \
  && spack compiler remove --scope defaults -a gcc || true \
  && spack compiler remove --scope defaults -a clang || true \
  && spack compiler remove --scope system -a gcc || true \

diff --git a/spack/3a-precomp/Dockerfile b/spack/3a-precomp/Dockerfile
@@ -9,7 +9,7 @@ LABEL "org.opencontainers.image.source"="https://github.com/pdidev/test_env"
 
 COPY spack.yaml spack.yaml
 RUN spack env create pdienv spack.yaml \
- && spack -e pdienv add -l compilerpkg ""$(cat compilerpkg.lst)"" \
+ && spack -e pdienv add -l compilerpkg "$(cat compilerpkg.lst)" \
  && spack -e pdienv add -l compiler "$(cat compiler.lst)" \
  && spack clean -a