Skip to content

Commit 8696007

Browse files
committed
ci: Remove obsolete clean-up tasks
This commit removes the now-obsolete tasks that clean up the workspace directories. These clean-up tasks were necessary back when the zephyr-runner was not fully ephemeral; zephyr-runner v2 is fully ephemeral and these hacks are no longer necessary. Signed-off-by: Stephanos Ioannidis <[email protected]>
1 parent 50b5922 commit 8696007

File tree

1 file changed

+1
-72
lines changed

1 file changed

+1
-72
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -462,12 +462,6 @@ jobs:
462462
WORKSPACE="${RUNNER_TEMP}/workspace"
463463
sudo mkdir -p ${WORKSPACE}
464464
465-
# Clean up working directories
466-
shopt -s dotglob
467-
sudo rm -rf ${GITHUB_WORKSPACE}/*
468-
sudo rm -rf ${WORKSPACE}/*
469-
shopt -u dotglob
470-
471465
# Allow non-root access to the working directories
472466
sudo chmod -R 777 ${GITHUB_WORKSPACE}
473467
sudo chmod -R 777 ${RUNNER_TEMP}
@@ -522,28 +516,8 @@ jobs:
522516
- name: Set up build environment (macOS)
523517
if: ${{ runner.os == 'macOS' }}
524518
run: |
525-
# Delete workspace from the previous run
526-
WORKSPACE="/Volumes/Workspace"
527-
if [ -d ${WORKSPACE} ]; then
528-
# Get disk device name
529-
OLDDISK=$(diskutil info -plist "${WORKSPACE}" |
530-
plutil -extract ParentWholeDisk xml1 - -o - |
531-
sed -n "s/.*<string>\(.*\)<\/string>.*/\1/p")
532-
533-
# Force unmount and eject to deallocate disk blocks
534-
if [ ! -z "${OLDDISK}" ]; then
535-
diskutil unmountDisk force ${OLDDISK}
536-
diskutil eject ${OLDDISK}
537-
fi
538-
fi
539-
540-
# Clean up working directories
541-
shopt -s dotglob
542-
rm -rf ${GITHUB_WORKSPACE}/*
543-
rm -f ${RUNNER_TEMP}/Workspace.sparseimage
544-
shopt -u dotglob
545-
546519
# Create case-sensitive workspace volume for macOS
520+
WORKSPACE="/Volumes/Workspace"
547521
hdiutil create ${RUNNER_TEMP}/Workspace.sparseimage \
548522
-volname Workspace -type SPARSE -size 150g -fs HFSX
549523
hdiutil mount ${RUNNER_TEMP}/Workspace.sparseimage -mountpoint ${WORKSPACE}
@@ -1017,22 +991,12 @@ jobs:
1017991
- name: Set up build environment (Linux)
1018992
if: ${{ runner.os == 'Linux' }}
1019993
run: |
1020-
# Clean up working directories
1021-
shopt -s dotglob
1022-
sudo rm -rf ${GITHUB_WORKSPACE}/*
1023-
shopt -u dotglob
1024-
1025994
# Set environment variables
1026995
echo "TAR=tar" >> $GITHUB_ENV
1027996
1028997
- name: Set up build environment (macOS)
1029998
if: ${{ runner.os == 'macOS' }}
1030999
run: |
1031-
# Clean up working directories
1032-
shopt -s dotglob
1033-
rm -rf ${GITHUB_WORKSPACE}/*
1034-
shopt -u dotglob
1035-
10361000
# Set environment variables
10371001
echo "TAR=gtar" >> $GITHUB_ENV
10381002
@@ -1158,11 +1122,6 @@ jobs:
11581122
- name: Set up build environment (Linux)
11591123
if: ${{ runner.os == 'Linux' }}
11601124
run: |
1161-
# Clean up working directories
1162-
shopt -s dotglob
1163-
sudo rm -rf ${GITHUB_WORKSPACE}/*
1164-
shopt -u dotglob
1165-
11661125
# Install common dependencies
11671126
sudo apt-get update
11681127
sudo apt-get install -y p7zip
@@ -1173,11 +1132,6 @@ jobs:
11731132
- name: Set up build environment (macOS)
11741133
if: ${{ runner.os == 'macOS' }}
11751134
run: |
1176-
# Clean up working directories
1177-
shopt -s dotglob
1178-
rm -rf ${GITHUB_WORKSPACE}/*
1179-
shopt -u dotglob
1180-
11811135
# Install required dependencies if running inside a GitHub-hosted runner
11821136
# (self-hosted runners are expected to provide all required dependencies)
11831137
if [[ "${{ matrix.host.runner }}" =~ ^macos.* ]]; then
@@ -1248,11 +1202,6 @@ jobs:
12481202
- name: Set up build environment (Linux)
12491203
if: ${{ runner.os == 'Linux' }}
12501204
run: |
1251-
# Clean up working directories
1252-
shopt -s dotglob
1253-
sudo rm -rf ${GITHUB_WORKSPACE}/*
1254-
shopt -u dotglob
1255-
12561205
# Install common dependencies
12571206
sudo apt-get update
12581207
sudo apt-get install -y jq p7zip
@@ -1263,11 +1212,6 @@ jobs:
12631212
- name: Set up build environment (macOS)
12641213
if: ${{ runner.os == 'macOS' }}
12651214
run: |
1266-
# Clean up working directories
1267-
shopt -s dotglob
1268-
rm -rf ${GITHUB_WORKSPACE}/*
1269-
shopt -u dotglob
1270-
12711215
# Install required dependencies if running inside a GitHub-hosted runner
12721216
# (self-hosted runners are expected to provide all required dependencies)
12731217
if [[ "${{ matrix.host.runner }}" =~ ^macos.* ]]; then
@@ -1514,11 +1458,6 @@ jobs:
15141458
- name: Set up test environment (Linux)
15151459
if: ${{ runner.os == 'Linux' }}
15161460
run: |
1517-
# Clean up working directories
1518-
shopt -s dotglob
1519-
sudo rm -rf ${GITHUB_WORKSPACE}/*
1520-
shopt -u dotglob
1521-
15221461
# Install required system packages
15231462
sudo apt-get update
15241463
sudo apt-get install -y dos2unix jq
@@ -1530,11 +1469,6 @@ jobs:
15301469
- name: Set up test environment (macOS)
15311470
if: ${{ runner.os == 'macOS' }}
15321471
run: |
1533-
# Clean up working directories
1534-
shopt -s dotglob
1535-
rm -rf ${GITHUB_WORKSPACE}/*
1536-
shopt -u dotglob
1537-
15381472
# Install required dependencies if running inside a GitHub-hosted runner
15391473
# (self-hosted runners are expected to provide all required dependencies)
15401474
if [[ "${{ matrix.host.runner }}" =~ ^macos.* ]]; then
@@ -1548,11 +1482,6 @@ jobs:
15481482
- name: Set up test environment (Windows)
15491483
if: ${{ runner.os == 'Windows' }}
15501484
run: |
1551-
# Clean up working directories
1552-
shopt -s dotglob
1553-
rm -rf ${GITHUB_WORKSPACE}/*
1554-
shopt -u dotglob
1555-
15561485
# Install required system packages
15571486
choco install ccache dtc-msys2 gperf jq ninja wget 7zip
15581487

0 commit comments

Comments
 (0)