From f58ef95a4e33be4a3362b6dd3a2524bead236b81 Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Wed, 27 Mar 2024 17:24:10 -0400 Subject: [PATCH 1/3] github: bitbake in stages to preserve disk space We only have 14Gb [1] of disk and 'rm_work' isn't removing enough to keep us under that limit. So, bitbake in stages and wipe tmp/ in between in an effort to preserve disk. 1. https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources Signed-off-by: Justin Bronder (cherry picked from commit 62b216f37ee2d21ce6583a4f3d6edefb82e48608) --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9f48d7..6c047be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,9 +70,13 @@ jobs: else echo 'DISTRO_FEATURES += "openrc"' >> conf/local.conf fi - - name: Build operc image + - name: Build openrc image run: | source poky/oe-init-build-env build + # Build in stages so we can wipe tmp in between to stay under the + # 14Gb of disk Github gives us. rm_work isn't sufficient. + bitbake openrc + rm -rf tmp/ bitbake openrc-image - name: Prune Shared-State Cache and tmpdir if: always() From fc5e796c48a360b377aebcfc5f7aa154aeda985e Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Tue, 5 Nov 2024 17:11:46 -0500 Subject: [PATCH 2/3] github: bump ubuntu 20.04 -> 24.04 - We need a newer version of python3-websockets to connect to the new upstream hashserver. - Enable unprivileged user namespaces which are disabled by default in 24.04. Signed-off-by: Justin Bronder (cherry picked from commit 2d401214f45e7e12d2e4647348f0d014d8b1dbc0) --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c047be..ff6fb27 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ on: jobs: build: name: build openrc-image - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 720 steps: - name: Configure Environment [branch] @@ -36,9 +36,10 @@ jobs: else echo 'OE_BRANCH='${{ github.base_ref}} >> $GITHUB_ENV fi - - name: Install required packages + - name: Configure Host run: | - sudo apt-get install diffstat + sudo apt-get install chrpath diffstat + echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns - name: Checkout uses: actions/checkout@v4 with: From 63009647763e1984443b01d5d32a29f8f92092d6 Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Mon, 4 Nov 2024 16:40:44 -0500 Subject: [PATCH 3/3] github: update BB_HASHSERVE_UPSTREAM to use websockets Signed-off-by: Justin Bronder (cherry picked from commit cb41395f54ca55983301f86e4cad5df22f9ad045) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff6fb27..838cc86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: fi - name: Configure Host run: | - sudo apt-get install chrpath diffstat + sudo apt-get install chrpath diffstat python3-websockets echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns - name: Checkout uses: actions/checkout@v4 @@ -64,7 +64,7 @@ jobs: echo 'BB_SIGNATURE_HANDLER = "OEEquivHash"' >> conf/local.conf echo 'SSTATE_MIRRORS += "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH"' >> conf/local.conf echo 'BB_HASHSERVE = "auto"' >> conf/local.conf - echo 'BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687"' >> conf/local.conf + echo 'BB_HASHSERVE_UPSTREAM = "wss://hashserv.yoctoproject.org/ws"' >> conf/local.conf echo 'BB_DISKMON_DIRS = "STOPTASKS,${TMPDIR},100M,10K HALT,${TMPDIR},50M,5k"' >> conf/local.conf if [ ${{ env.OE_BRANCH }} != "kirkstone" ]; then echo 'INIT_MANAGER = "openrc"' >> conf/local.conf