Skip to content

Commit c2110a2

Browse files
committed
Revert changes
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent fc257c2 commit c2110a2

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

.github/actions/get-latest-upstream/action.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@ runs:
1616
steps:
1717
- name: Get latest upstream
1818
shell: bash
19+
env:
20+
IS_RELEASE: true
21+
GH_CLI_TOKEN: ${{ inputs.gh_cli_token }}
1922
run: |
2023
sudo apt update
21-
sudo apt install jq
22-
AUTH_HEADER="Authorization: token ${{ inputs.gh_cli_token }}"
23-
if [ "${{ inputs.release }}" = "true" ]; then
24+
sudo apt install gh
25+
echo "${GH_CLI_TOKEN}" | gh auth login --with-token
26+
if [ "true" = "true" ]; then
2427
echo "Getting the latest stable release."
2528
RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[] | select(.prerelease == false)] | .[0].tag_name')
2629
else

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
paths-ignore:
2727
- '**.md'
2828
- '.*'
29-
pull_request_target:
29+
pull_request:
3030
paths-ignore:
3131
- '**.md'
3232

.github/workflows/helm-chart-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
retry_wait_seconds: 60
171171
command: NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
172172
- name: Login Docker Hub
173-
run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
173+
run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" || true
174174
env:
175175
DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
176176
DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}

Video/video.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ ts_format=${SE_LOG_TIMESTAMP_FORMAT:-"%Y-%m-%d %H:%M:%S,%3N"}
2222
process_name="video.recorder"
2323

2424
if [ "${SE_VIDEO_RECORD_STANDALONE}" = "true" ]; then
25-
JQ_SESSION_ID_QUERY=".value.nodes[-1]?.slots[-1]?.session?.sessionId"
25+
JQ_SESSION_ID_QUERY=".value.nodes[]?.slots[]?.session?.sessionId"
2626
SE_NODE_PORT=${SE_NODE_PORT:-"4444"}
2727
NODE_STATUS_ENDPOINT="$(/opt/bin/video_gridUrl.sh)/status"
2828
else
29-
JQ_SESSION_ID_QUERY=".[-1]?.node?.slots | .[-1]?.session?.sessionId"
29+
JQ_SESSION_ID_QUERY=".[]?.node?.slots | .[0]?.session?.sessionId"
3030
SE_NODE_PORT=${SE_NODE_PORT:-"5555"}
3131
NODE_STATUS_ENDPOINT="${SE_SERVER_PROTOCOL}://${DISPLAY_CONTAINER_NAME}:${SE_NODE_PORT}/status"
3232
fi
@@ -259,7 +259,7 @@ else
259259
fi
260260
echo "$(date -u +"${ts_format}") [${process_name}] - Video recording started"
261261
sleep ${poll_interval}
262-
elif [[ "$recording_started" = "true" && ("$session_id" != "$prev_session_id" || "$session_id" == "null" || "$session_id" == "") ]]; then
262+
elif [[ "$session_id" != "$prev_session_id" && "$recording_started" = "true" ]]; then
263263
stop_recording
264264
wait_for_file_integrity
265265
if [[ $max_recorded_count -gt 0 ]] && [[ $recorded_count -ge $max_recorded_count ]]; then

Video/video_graphQLQuery.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
max_time=1
4-
retry_time=2
4+
retry_time=3
55

66
# Define parameters
77
SESSION_ID=$1

0 commit comments

Comments
 (0)