Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit 9faa7ff

Browse files
authored
Fix command order in action, improve messages
1 parent 8239951 commit 9faa7ff

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

.github/actions/smoke-test/action.yaml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,17 @@ runs:
3030
set -e
3131
3232
# Symlink build scripts from main to improve security when testing PRs
33-
cd "$GITHUB_WORKSPACE/__build"
34-
yarn install
35-
rm -rf build node_modules
36-
ln -s "$GITHUB_WORKSPACE/__build/build" build
37-
ln -s "$GITHUB_WORKSPACE/__build/node_modules" node_modules
38-
cd "$GITHUB_WORKSPACE"
33+
if [ -d "$GITHUB_WORKSPACE/__build/build" ]; then
34+
cd "$GITHUB_WORKSPACE/__build"
35+
yarn install
36+
cd "$GITHUB_WORKSPACE"
37+
rm -rf build node_modules
38+
ln -s "$GITHUB_WORKSPACE/__build/build" build
39+
ln -s "$GITHUB_WORKSPACE/__build/node_modules" node_modules
40+
else
41+
echo "WARNING: Using build/vscdc from ${{ github.ref }} instead of main."
42+
yarn install
43+
fi
3944
4045
# Run test build
4146
GIT_BRANCH=$(echo "${{ github.ref }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
@@ -74,9 +79,9 @@ runs:
7479
# The dev container CLI handles this automatically but we're not using it.
7580
local_uid=$(id -u)
7681
local_gid=$(id -g)
82+
echo "(*) Update container user UID/GID..."
7783
docker exec -u root ${container_name} /bin/sh -c "\
78-
echo \"(*) Update user UID/GID...\" \
79-
&& groupmod -g ${local_gid} ${{ inputs.user }} \
84+
groupmod -g ${local_gid} ${{ inputs.user }} \
8085
&& usermod -u ${local_uid} -g ${local_gid} ${{ inputs.user }}"
8186
8287
# Fake out existence of extensions, VS Code Server
@@ -87,12 +92,11 @@ runs:
8792
dev_container_tmp="/tmp/${dev_container_relative_path}/devcontainer.json"
8893
sed -i'.bak' -e "s/\\/\\/.*/ /g" "${dev_container_tmp}"
8994
extensions="$(jq '.extensions' --compact-output "${dev_container_tmp}" | tr -d '[' | tr -d ']' | tr ',' '\n' 2>/dev/null || echo -n '')"
90-
echo "(*) Extensions in devcontainer.json: ${extensions}"
9195
docker exec -u "${{ inputs.user }}" ${container_name} /bin/sh -c "\
92-
echo \"(*) Creating folders in \$HOME...\" \
93-
&& mkdir -p \$HOME/.vscode-server/bin \$HOME/.vscode-server/extensions \
96+
mkdir -p \$HOME/.vscode-server/bin \$HOME/.vscode-server/extensions \
9497
&& cd \$HOME/.vscode-server/extensions \
95-
&& if [ \"${extensions}\" != '' ]; then echo \"${extensions}\" | xargs -n 1 mkdir -p; fi"
98+
&& if [ \"${extensions}\" != '' ]; then echo \"${extensions}\" | xargs -n 1 mkdir -p; fi \
99+
&& find \$HOME/.vscode-server/ -type d"
96100
97101
# Run actual test
98102
echo "(*) Running test..."

0 commit comments

Comments
 (0)