Skip to content

Commit 10932a5

Browse files
authored
Merge branch 'trunk' into fix/15530-passing-headers-for-paused-request
2 parents a898f9d + 7b0236e commit 10932a5

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/bazel.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ jobs:
139139
uses: bazel-contrib/[email protected]
140140
with:
141141
bazelrc: common --color=yes
142+
- name: Setup curl for Ubuntu
143+
if: inputs.os == 'ubuntu'
144+
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
142145
- name: Setup Fluxbox and Xvfb
143146
if: inputs.os == 'ubuntu' && inputs.browser != ''
144147
run: |
@@ -152,9 +155,6 @@ jobs:
152155
- name: Setup Safari
153156
if: inputs.browser == 'safari'
154157
run: sudo safaridriver --enable
155-
- name: Setup curl for Ubuntu
156-
if: inputs.os == 'ubuntu'
157-
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
158158
- name: Run Bazel
159159
run: ${{ inputs.run }}
160160
- name: Start SSH session

Rakefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,7 @@ namespace :node do
544544
end
545545

546546
# Update package-lock.json
547-
Dir.chdir('javascript/selenium-webdriver') do
548-
sh 'npm install --prefix javascript/selenium-webdriver', verbose: true
549-
end
547+
sh 'npm install --prefix javascript/selenium-webdriver', verbose: true
550548
@git.add('javascript/selenium-webdriver/package-lock.json')
551549
end
552550
end

0 commit comments

Comments
 (0)