mirror of
https://github.com/vector-im/element-web.git
synced 2026-04-18 03:52:39 +02:00
Merge branch 'develop' into hs/enable-profile-updates
This commit is contained in:
commit
9331e99636
3
nx.json
3
nx.json
@ -8,5 +8,6 @@
|
||||
},
|
||||
"namedInputs": {
|
||||
"src": ["{projectRoot}/src/**/*"]
|
||||
}
|
||||
},
|
||||
"analytics": false
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ SCRIPT_DIR=$(dirname "$SCRIPT_PATH")
|
||||
function build_image() {
|
||||
local IMAGE_NAME="$1"
|
||||
|
||||
echo "Building $IMAGE_NAME image in $SCRIPT_DIR"
|
||||
echo "playwright-screenshots: Building $IMAGE_NAME image in $SCRIPT_DIR"
|
||||
docker build -t "$IMAGE_NAME" --build-arg "PLAYWRIGHT_VERSION=${IMAGE_NAME#*:}" "$SCRIPT_DIR"
|
||||
}
|
||||
|
||||
@ -34,16 +34,19 @@ CONTAINER=$(docker run --network=host -v /tmp:/tmp --rm -d -e PORT="$WS_PORT" "$
|
||||
# Set up an exit trap to clean up the docker container
|
||||
clean_up() {
|
||||
ARG=$?
|
||||
echo "Stopping playwright-server"
|
||||
echo "playwright-screenshots: Stopping playwright-server"
|
||||
docker stop "$CONTAINER" > /dev/null
|
||||
exit $ARG
|
||||
}
|
||||
trap clean_up EXIT
|
||||
|
||||
# Wait for playwright-server to be ready
|
||||
echo "Waiting for playwright-server"
|
||||
echo "playwright-screenshots: Waiting for playwright-server"
|
||||
pnpm --dir "$SCRIPT_DIR" exec wait-on "tcp:$WS_PORT"
|
||||
|
||||
# Playwright seems to overwrite the last line from the console, so add an
|
||||
# extra newline to make sure this doesn't get lost.
|
||||
echo -e "playwright-screenshots: Running '$@'\n"
|
||||
|
||||
# Run the test we were given, setting PW_TEST_CONNECT_WS_ENDPOINT accordingly
|
||||
echo "Running '$@'"
|
||||
PW_TEST_CONNECT_WS_ENDPOINT="http://localhost:$WS_PORT" "$@"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user