Only containerize the actual package build

Author: mszabo-wikia

.github/workflows/ubuntu.yml

@@ -5,7 +5,7 @@ on:
     branches-ignore:
       # Exclude the push event for exported diffs, because the CI for export
       # should have been covered by GitHub Actions triggered by pull requests.
-      - 'export-D+'
+      - "export-D+"
   pull_request:
 
 concurrency:
@@ -25,41 +25,28 @@ env:
   DEBIAN_FRONTEND: "noninteractive"
 
 jobs:
-  build_ubuntu_focal_nightly:
-    runs-on: 8-core-ubuntu
-    container:
-      image: ubuntu:noble
-      env:
-        DISTRO: ubuntu-24.04-noble
-        IS_NIGHTLY: 1
-        CLANG_VERSION: 18
+  build_ubuntu_noble_nightly:
+    runs-on: ubuntu-latest
     steps:
-    - name: Installing dependencies to bootstrap env
-      run: apt update -y && apt install -y git wget lsb-release software-properties-common gpg clang clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev
-    - name: Making LLVM the default compiler
-      run: |
-        if [ -f /etc/alternatives/cc ]
-        then
-          update-alternatives --remove-all cc
-        fi
-
-        if [ -f /etc/alternatives/c++ ]
-        then
-          update-alternatives --remove-all c++
-        fi
-
-        update-alternatives --install /usr/bin/cc cc /usr/bin/clang++-${CLANG_VERSION} 500
-        update-alternatives --set cc /usr/bin/clang++-${CLANG_VERSION}
-        update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${CLANG_VERSION} 500
-        update-alternatives --set c++ /usr/bin/clang++-${CLANG_VERSION}
-    - name: Fetching HHVM and its submodules
-      uses: actions/checkout@v4
-      with:
-        submodules: 'recursive'
-    - name: Installing HHVM deps and building HHVM
-      run: ci/bin/make-debianish-package
-    - name: Uploading artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: out-directory
-        path: ${{ env.OUT }}
+      # The HHVM build requires more disk space than what is available
+      # on a default Actions runner, so remove some cruft.
+      - name: Free up disk space
+        uses: jlumbroso/[email protected]
+      - name: Fetching HHVM and its submodules
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+      - name: Installing HHVM deps and building HHVM
+        uses: docker://ubuntu:noble
+        env:
+          DISTRO: ubuntu-24.04-noble
+          IS_NIGHTLY: 1
+          CLANG_VERSION: 18
+        with:
+          entrypoint: /bin/bash
+          args: ci/bin/make-debianish-package
+      - name: Uploading artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: out-directory
+          path: ${{ env.OUT }}

ci/bin/make-debianish-package

@@ -34,9 +34,23 @@ OUT=${OUT:-/var/out}
 mkdir -p "$OUT"
 
 # Environment set up
-apt-get -o Acquire::Retries=3 update -y
-apt-get clean
-apt-get -o Acquire::Retries=3 install -y devscripts equivs
+apt update -y && apt install -y devscripts equivs git wget lsb-release software-properties-common gpg clang clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev
+
+# Making LLVM the default compiler
+if [ -f /etc/alternatives/cc ]
+then
+  update-alternatives --remove-all cc
+fi
+
+if [ -f /etc/alternatives/c++ ]
+then
+  update-alternatives --remove-all c++
+fi
+
+update-alternatives --install /usr/bin/cc cc /usr/bin/clang++-${CLANG_VERSION} 500
+update-alternatives --set cc /usr/bin/clang++-${CLANG_VERSION}
+update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${CLANG_VERSION} 500
+update-alternatives --set c++ /usr/bin/clang++-${CLANG_VERSION}
 
 # Copy the debian directory to the root of the git repo
 # so that all the devscripts command work.