Handle swap at the action level and use 10G swap for each LLVM build

pdidev · Jul 3, 2024 · e8bf13b · e8bf13b
1 parent d51d69a
commit e8bf13b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -19,6 +19,9 @@ inputs:
   tags:
     default: ""
     description: "Additional tags"
+  swap:
+    default: "0"
+    description: "Additional swap to allocate"
   test:
     default: false
     description: "Whether to build the test target before publishing"
@@ -67,6 +70,12 @@ runs:
       context: "{{defaultContext}}:${{ inputs.path }}"
       load: true
       target: test
+  - if: "${{ inputs.swap != '0' }}"
+    run: |
+      sudo fallocate -l "${{ inputs.swap }}" /swapfile
+      sudo chmod 600 /swapfile
+      sudo mkswap /swapfile
+      sudo swapon /swapfile
   - if: "${{ inputs.cache == 'true' }}"
     uses: docker/build-push-action@v5
     with:
@@ -91,3 +100,7 @@ runs:
         ${{ inputs.tags }}
       context: "{{defaultContext}}:${{ inputs.path }}"
       push: true
+  - name: "Remove swap file"
+    run: |
+      sudo swapoff /swapfile || true
+      sudo rm -f /swapfile || true
diff --git a/.github/workflows/debuntu_docker_images.yml b/.github/workflows/debuntu_docker_images.yml
@@ -26,7 +26,7 @@ jobs:
         echo "distro=${BASE%/*}" >> "${GITHUB_OUTPUT}"
         echo "distro_version=${BASE##*/}" >> "${GITHUB_OUTPUT}"
     - name: "Build and push"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: debuntu/${{ matrix.variant }}

diff --git a/.github/workflows/spack_docker_images.yml b/.github/workflows/spack_docker_images.yml
@@ -10,14 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 1a-base"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/1a-base
         image-name: base
         cache: ${{ github.event_name != 'schedule' }}
     - name: "Build and push 1b-spackbase"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/1b-spackbase
@@ -32,35 +32,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 2a-precomp"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/2a-precomp
         image-name: builder:${{ matrix.version }}-${{ matrix.compiler }}-2a
         build-args: |
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
-    - name: "Create swap file"
-      run: |
-        sudo fallocate -l 12G /swapfile
-        sudo chmod 600 /swapfile
-        sudo mkswap /swapfile
-        sudo swapon /swapfile
     - name: "Build and push 2b-compiler"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/2b-compiler
+        swap: 10G
         image-name: builder:${{ matrix.version }}-${{ matrix.compiler }}-2b
         build-args: |
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
-    - name: "Remove swap file"
-      run: |
-        sudo swapoff /swapfile
-        sudo rm /swapfile
     - name: "Build and push 2c-squash"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/2c-squash
@@ -78,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 3a-precomp"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/3a-precomp
@@ -87,16 +78,17 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 3b-compiler"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/3b-compiler
+        swap: 10G
         image-name: builder:${{ matrix.version }}-${{ matrix.compiler }}-3b
         build-args: |
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 3c-squash"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/3c-squash
@@ -105,7 +97,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 4a-baselibs"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/4a-baselibs
@@ -114,7 +106,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 4b-squash"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/4b-squash
@@ -133,7 +125,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 5a-mpi"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/5a-mpi
@@ -143,7 +135,7 @@ jobs:
           COMPILER=${{ matrix.compiler }}
           MPI=${{ matrix.mpi }}
     - name: "Build and push spack/5b-squash"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/5b-squash
@@ -153,7 +145,7 @@ jobs:
           COMPILER=${{ matrix.compiler }}
           MPI=${{ matrix.mpi }}
     - name: "Build and push 6-optlibs"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/6-optlibs
@@ -181,7 +173,7 @@ jobs:
           echo "tags=ghcr.io/pdidev/spack/${{ matrix.version }}/${{ matrix.compiler }}/${{ matrix.mpi }}/${{ matrix.level }}:${{github.ref_name}}" >> "${GITHUB_OUTPUT}"
         fi
     - name: "Build and push"
-      uses: pdidev/test_env/.github/actions/build@main
+      uses: pdidev/test_env/.github/actions/build@v3
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/7-finalize