Skip to content

Commit b46ec8b

Browse files
committed
chore: use native github runners for image building
1 parent b2f70ab commit b46ec8b

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

.github/workflows/tox.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
other_names_also: |
4141
devspaces
4242
devel
43-
ee-amd64:tox -e ee:runner=devtools-multiarch-builder
44-
ee-arm64:tox -e ee:runner=ubuntu-24.04-arm64-2core
43+
ee-amd64:tox -e ee:runner=ubuntu-24.04
44+
ee-arm64:tox -e ee:runner=ubuntu-24.04-arm
4545
secrets: inherit # needed for logging to the ghcr.io registry
4646

4747
codeql:

pyproject.toml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,11 @@ set_env.TERM = "dump"
537537

538538
[tool.tox.env.ee]
539539
commands = [["python", "-m", "build", "--version"], ["./tools/ee.sh"]]
540-
commands_post = [["./tools/cleanup.sh"]]
540+
commands_post = [
541+
["podman", "system", "df"],
542+
["df", "-h"],
543+
["./tools/cleanup.sh"]
544+
]
541545
commands_pre = []
542546
dependency_groups = ["ee", "dev"]
543547
description = "Build the ee container image"
@@ -587,12 +591,14 @@ skip_install = true
587591

588592
[tool.tox.env_run_base]
589593
allowlist_externals = [
594+
"./tools/cleanup.sh",
595+
"./tools/devspaces.sh",
596+
"./tools/ee.sh",
597+
"df",
590598
"git",
599+
"podman",
591600
"rm",
592601
"sh",
593-
"./tools/cleanup.sh",
594-
"./tools/devspaces.sh",
595-
"./tools/ee.sh"
596602
]
597603
commands = [
598604
["sh", "-c", "ansible --version | head -n 1"],

tools/test-setup.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
#!/bin/bash -e
2+
# cspell: ignore hhvm anthoscli
23
set -eux pipefail
34

45
if [[ -f "/usr/bin/apt-get" ]]; then
6+
dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n | tail -n 20
7+
df -h
8+
echo "Removing large packages so GHA runners do not run out of disk space during image building"
9+
sudo apt-get remove -y '^ghc-8.*' '^dotnet-.*' '^llvm-.*' 'php.*' azure-cli google-cloud-sdk hhvm google-chrome-stable google-cloud-cli google-cloud-cli-anthoscli firefox powershell mono-devel microsoft-edge-stable || true
10+
sudo apt-get autoremove -y
511
sudo apt-get install -y -q libonig-dev
12+
sudo apt-get clean
13+
sudo rm -rf /usr/share/dotnet/
14+
df -h
15+
podman info --format '{{ json .Store }}' | jq
16+
podman system df
617
fi

0 commit comments

Comments
 (0)