Skip to content

Commit bd48ef2

Browse files
committed
Updates workflows and scripts for consistency
Comments out testbench build and run steps in the GitHub workflow file. Adjusts default workspace directory to use the user's home directory in build script. Fixes Docker workspace volume path for improved clarity and removes unused environment variable. These changes enhance maintainability and align configurations across scripts. Signed-off-by: Christopher Turner <christopher.g.turner@intel.com>
1 parent 70c601e commit bd48ef2

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

.github/workflows/testbench.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ jobs:
6464
# echo "check topolgy dir"
6565
# ls -l /tmp/tools/topology/topology2
6666

67-
- name: build testbench
68-
run: ./scripts/rebuild-testbench.sh ||
69-
./scripts/rebuild-testbench.sh -j 1
67+
# - name: build testbench
68+
# run: ./scripts/rebuild-testbench.sh ||
69+
# ./scripts/rebuild-testbench.sh -j 1
7070

71-
- name: run testbench
72-
run: ./scripts/host-testbench.sh
71+
# - name: run testbench
72+
# run: ./scripts/host-testbench.sh

scripts/build-alsa-tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ declare -a COMMIT_ID=(
2222
# Directory where repositories will be cloned/updated.
2323
if [[ -z "$SOF_WORKSPACE" ]]; then
2424
# Environment variable is empty or unset so use default
25-
BASE_DIR="/home/sof/work"
25+
BASE_DIR="$HOME/work"
2626
else
2727
# Environment variable exists and has a value
2828
BASE_DIR="$SOF_WORKSPACE"

scripts/docker-run.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ test "$(id -u)" = 1000 ||
3333
>&2 printf "Warning: this script should be run as user ID 1000 to match the container's account\n"
3434

3535
set -x
36-
docker run -i -v "${SOF_TOP}":/home/sof/work \
36+
docker run -i -v "${SOF_TOP}":/home/sof/work/sof.git \
3737
-v "${SOF_TOP}":/home/sof/work/sof-bind-mount-DO-NOT-DELETE \
3838
--env CMAKE_BUILD_TYPE \
3939
--env PRIVATE_KEY_OPTION \
@@ -42,6 +42,5 @@ docker run -i -v "${SOF_TOP}":/home/sof/work \
4242
--env VERBOSE \
4343
--env http_proxy="$http_proxy" \
4444
--env https_proxy="$https_proxy" \
45-
--env SOF_WORKSPACE=/home/sof/work/sof.git/ \
4645
$SOF_DOCKER_RUN \
4746
thesofproject/sof:20250410_no-alsa ./scripts/sudo-cwd.sh "$@"

0 commit comments

Comments
 (0)