Skip to content

Commit 33c4eff

Browse files
committed
Adjust Actions cache directory
1 parent cb3e90f commit 33c4eff

6 files changed

+100
-21
lines changed

.github/workflows/build-armbian-homeassistant-image.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ env:
259259

260260
jobs:
261261
build:
262-
runs-on: ubuntu-24.04-arm
262+
runs-on: ubuntu-24.04
263263
if: ${{ github.event.repository.owner.id }} == ${{ github.event.sender.id }}
264264

265265
steps:
@@ -304,11 +304,23 @@ jobs:
304304
sudo pvcreate /dev/loop7
305305
sudo vgcreate github /dev/loop6 /dev/loop7
306306
sudo lvcreate -n runner -l 100%FREE github
307-
sudo mkfs.xfs /dev/github/runner
307+
sudo mkfs.xfs -f -i sparse=0 -b size=4096 /dev/github/runner
308308
sudo mkdir -p /builder
309309
sudo mount /dev/github/runner /builder
310-
sudo chown -R runner.runner /builder
310+
sudo chown -R runner:runner /builder
311+
# Prepare cached directory
312+
echo "Preparing cached directory..."
313+
sudo cp -af /home/runner/actions-runner/cached /builder/cached
314+
rm -rf /home/runner/actions-runner/cached
315+
sudo ln -sf /builder/cached /home/runner/actions-runner/cached
316+
echo "_diag directory content:"
317+
ls -lh /home/runner/actions-runner/cached/_diag/ 2>/dev/null
318+
echo "Verifying the symbolic link..."
319+
ls -ld /home/runner/actions-runner/cached
320+
df -Th /home/runner/actions-runner/cached
321+
echo "Server disk layout:"
311322
df -Th
323+
echo "status=success" >> ${GITHUB_OUTPUT}
312324
313325
- name: Download source code
314326
id: down
@@ -317,7 +329,7 @@ jobs:
317329
run: |
318330
df -hT ${PWD}
319331
git clone -q --single-branch --depth=1 --branch=main https://github.com/armbian/build.git build
320-
ln -sf /builder/build ${GITHUB_WORKSPACE}/build
332+
ln -sf /builder/build ${{ github.workspace }}/build
321333
ln -sf /builder/build /home/runner/work/_actions/ophub/amlogic-s9xxx-armbian/main/build
322334
# 下载扩展的安装homeasssistant脚本
323335
wget -P ./build/extensions https://raw.githubusercontent.com/armbian/os/main/userpatches/extensions/docker-ce.sh
@@ -349,6 +361,10 @@ jobs:
349361
chmod +x ${ROOTFS_SCRIPT}
350362
${ROOTFS_SCRIPT} -v ${{ inputs.set_release }} -s true -c true -k true
351363
364+
# Clean build directory except output folder
365+
cd build/
366+
rm -rf $(ls . | grep -v "^output$" | xargs) 2>/dev/null
367+
352368
# Output cleaning result information
353369
df -hT ${PWD}
354370
echo "build_tag=Armbian_HassIoSupervisor_${{ inputs.set_release }}_${{ inputs.armbian_storage }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT}

.github/workflows/build-armbian-server-image.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ env:
259259

260260
jobs:
261261
build:
262-
runs-on: ubuntu-24.04-arm
262+
runs-on: ubuntu-24.04
263263
if: ${{ github.event.repository.owner.id }} == ${{ github.event.sender.id }}
264264

265265
steps:
@@ -304,11 +304,23 @@ jobs:
304304
sudo pvcreate /dev/loop7
305305
sudo vgcreate github /dev/loop6 /dev/loop7
306306
sudo lvcreate -n runner -l 100%FREE github
307-
sudo mkfs.xfs /dev/github/runner
307+
sudo mkfs.xfs -f -i sparse=0 -b size=4096 /dev/github/runner
308308
sudo mkdir -p /builder
309309
sudo mount /dev/github/runner /builder
310-
sudo chown -R runner.runner /builder
310+
sudo chown -R runner:runner /builder
311+
# Prepare cached directory
312+
echo "Preparing cached directory..."
313+
sudo cp -af /home/runner/actions-runner/cached /builder/cached
314+
rm -rf /home/runner/actions-runner/cached
315+
sudo ln -sf /builder/cached /home/runner/actions-runner/cached
316+
echo "_diag directory content:"
317+
ls -lh /home/runner/actions-runner/cached/_diag/ 2>/dev/null
318+
echo "Verifying the symbolic link..."
319+
ls -ld /home/runner/actions-runner/cached
320+
df -Th /home/runner/actions-runner/cached
321+
echo "Server disk layout:"
311322
df -Th
323+
echo "status=success" >> ${GITHUB_OUTPUT}
312324
313325
- name: Download source code
314326
id: down
@@ -317,7 +329,7 @@ jobs:
317329
run: |
318330
df -hT ${PWD}
319331
git clone -q --single-branch --depth=1 --branch=main https://github.com/armbian/build.git build
320-
ln -sf /builder/build ${GITHUB_WORKSPACE}/build
332+
ln -sf /builder/build ${{ github.workspace }}/build
321333
ln -sf /builder/build /home/runner/work/_actions/ophub/amlogic-s9xxx-armbian/main/build
322334
echo "status=success" >> ${GITHUB_OUTPUT}
323335
@@ -341,6 +353,10 @@ jobs:
341353
chmod +x ${ROOTFS_SCRIPT}
342354
${ROOTFS_SCRIPT} -v ${{ inputs.set_release }} -s true -c true -k true
343355
356+
# Clean build directory except output folder
357+
cd build/
358+
rm -rf $(ls . | grep -v "^output$" | xargs) 2>/dev/null
359+
344360
# Output cleaning result information
345361
df -hT ${PWD}
346362
echo "build_tag=Armbian_${{ inputs.set_release }}_${{ inputs.armbian_storage }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT}

.github/workflows/build-armbian-using-official-image.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ env:
251251

252252
jobs:
253253
build:
254-
runs-on: ubuntu-24.04-arm
254+
runs-on: ubuntu-24.04
255255
if: ${{ github.event.repository.owner.id }} == ${{ github.event.sender.id }}
256256

257257
steps:
@@ -296,11 +296,23 @@ jobs:
296296
sudo pvcreate /dev/loop7
297297
sudo vgcreate github /dev/loop6 /dev/loop7
298298
sudo lvcreate -n runner -l 100%FREE github
299-
sudo mkfs.xfs /dev/github/runner
299+
sudo mkfs.xfs -f -i sparse=0 -b size=4096 /dev/github/runner
300300
sudo mkdir -p /builder
301301
sudo mount /dev/github/runner /builder
302-
sudo chown -R runner.runner /builder
302+
sudo chown -R runner:runner /builder
303+
# Prepare cached directory
304+
echo "Preparing cached directory..."
305+
sudo cp -af /home/runner/actions-runner/cached /builder/cached
306+
rm -rf /home/runner/actions-runner/cached
307+
sudo ln -sf /builder/cached /home/runner/actions-runner/cached
308+
echo "_diag directory content:"
309+
ls -lh /home/runner/actions-runner/cached/_diag/ 2>/dev/null
310+
echo "Verifying the symbolic link..."
311+
ls -ld /home/runner/actions-runner/cached
312+
df -Th /home/runner/actions-runner/cached
313+
echo "Server disk layout:"
303314
df -Th
315+
echo "status=success" >> ${GITHUB_OUTPUT}
304316
305317
- name: Set download address
306318
id: down
@@ -334,7 +346,7 @@ jobs:
334346
done
335347
336348
mkdir -p /builder/build
337-
ln -sf /builder/build ${GITHUB_WORKSPACE}/build
349+
ln -sf /builder/build ${{ github.workspace }}/build
338350
ln -sf /builder/build /home/runner/work/_actions/ophub/amlogic-s9xxx-armbian/main/build
339351
340352
sudo timedatectl set-timezone "${TZ}"

.github/workflows/build-armbian-using-releases-files.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ env:
258258

259259
jobs:
260260
build:
261-
runs-on: ubuntu-24.04-arm
261+
runs-on: ubuntu-24.04
262262
if: ${{ github.event.repository.owner.id }} == ${{ github.event.sender.id }}
263263

264264
steps:
@@ -303,11 +303,23 @@ jobs:
303303
sudo pvcreate /dev/loop7
304304
sudo vgcreate github /dev/loop6 /dev/loop7
305305
sudo lvcreate -n runner -l 100%FREE github
306-
sudo mkfs.xfs /dev/github/runner
306+
sudo mkfs.xfs -f -i sparse=0 -b size=4096 /dev/github/runner
307307
sudo mkdir -p /builder
308308
sudo mount /dev/github/runner /builder
309-
sudo chown -R runner.runner /builder
309+
sudo chown -R runner:runner /builder
310+
# Prepare cached directory
311+
echo "Preparing cached directory..."
312+
sudo cp -af /home/runner/actions-runner/cached /builder/cached
313+
rm -rf /home/runner/actions-runner/cached
314+
sudo ln -sf /builder/cached /home/runner/actions-runner/cached
315+
echo "_diag directory content:"
316+
ls -lh /home/runner/actions-runner/cached/_diag/ 2>/dev/null
317+
echo "Verifying the symbolic link..."
318+
ls -ld /home/runner/actions-runner/cached
319+
df -Th /home/runner/actions-runner/cached
320+
echo "Server disk layout:"
310321
df -Th
322+
echo "status=success" >> ${GITHUB_OUTPUT}
311323
312324
- name: Download Armbian from Releases
313325
id: down
@@ -316,7 +328,7 @@ jobs:
316328
run: |
317329
armbian_buildpath="build/output/images"
318330
[[ -d "${armbian_buildpath}" ]] || mkdir -p "${armbian_buildpath}"
319-
ln -sf /builder/build ${GITHUB_WORKSPACE}/build
331+
ln -sf /builder/build ${{ github.workspace }}/build
320332
ln -sf /builder/build /home/runner/work/_actions/ophub/amlogic-s9xxx-armbian/main/build
321333
322334
latest_version=$(curl -s \

.github/workflows/compile-kernel-on-a-server.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,23 @@ jobs:
139139
sudo pvcreate /dev/loop7
140140
sudo vgcreate github /dev/loop6 /dev/loop7
141141
sudo lvcreate -n runner -l 100%FREE github
142-
sudo mkfs.xfs /dev/github/runner
142+
sudo mkfs.xfs -f -i sparse=0 -b size=4096 /dev/github/runner
143143
sudo mkdir -p /builder
144144
sudo mount /dev/github/runner /builder
145-
sudo chown -R runner.runner /builder
146-
df -hT
145+
sudo chown -R runner:runner /builder
146+
# Prepare cached directory
147+
echo "Preparing cached directory..."
148+
sudo cp -af /home/runner/actions-runner/cached /builder/cached
149+
rm -rf /home/runner/actions-runner/cached
150+
sudo ln -sf /builder/cached /home/runner/actions-runner/cached
151+
echo "_diag directory content:"
152+
ls -lh /home/runner/actions-runner/cached/_diag/ 2>/dev/null
153+
echo "Verifying the symbolic link..."
154+
ls -ld /home/runner/actions-runner/cached
155+
df -Th /home/runner/actions-runner/cached
156+
echo "Server disk layout:"
157+
df -Th
158+
echo "status=success" >> ${GITHUB_OUTPUT}
147159
148160
- name: Create a mapped directory
149161
id: mapped

.github/workflows/compile-kernel-using-docker.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,21 @@ jobs:
150150
sudo pvcreate /dev/loop7
151151
sudo vgcreate github /dev/loop6 /dev/loop7
152152
sudo lvcreate -n runner -l 100%FREE github
153-
sudo mkfs.xfs /dev/github/runner
153+
sudo mkfs.xfs -f -i sparse=0 -b size=4096 /dev/github/runner
154154
sudo mkdir -p /builder
155155
sudo mount /dev/github/runner /builder
156-
sudo chown -R runner.runner /builder
156+
sudo chown -R runner:runner /builder
157+
# Prepare cached directory
158+
echo "Preparing cached directory..."
159+
sudo cp -af /home/runner/actions-runner/cached /builder/cached
160+
rm -rf /home/runner/actions-runner/cached
161+
sudo ln -sf /builder/cached /home/runner/actions-runner/cached
162+
echo "_diag directory content:"
163+
ls -lh /home/runner/actions-runner/cached/_diag/ 2>/dev/null
164+
echo "Verifying the symbolic link..."
165+
ls -ld /home/runner/actions-runner/cached
166+
df -Th /home/runner/actions-runner/cached
167+
echo "Server disk layout:"
157168
df -Th
158169
echo "status=success" >> ${GITHUB_OUTPUT}
159170

0 commit comments

Comments
 (0)