Skip to content

Commit d78c5e8

Browse files
titusfortnertitusfortner
authored
bazelisk is pre-installed on github runners (#11173)
1 parent 8e48e08 commit d78c5e8

File tree

6 files changed

+66
-83
lines changed

6 files changed

+66
-83
lines changed

‎.github/actions/setup-bazelisk/action.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎.github/workflows/ci-java.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ jobs:
3939
key: ${{ runner.os }}-bazel-build-${{ hashFiles('**/BUILD.bazel') }}
4040
restore-keys: |
4141
${{ runner.os }}-bazel-build-
42-
- name: Setup bazelisk
43-
uses: ./.github/actions/setup-bazelisk
4442
- name: Setup Java
4543
uses: actions/setup-java@v1
4644
with:
@@ -69,8 +67,6 @@ jobs:
6967
restore-keys: |
7068
${{ runner.os }}-bazel-small-tests-
7169
${{ runner.os }}-bazel-build-
72-
- name: Setup bazelisk
73-
uses: ./.github/actions/setup-bazelisk
7470
- name: Setup Java
7571
uses: actions/setup-java@v1
7672
with:
@@ -104,8 +100,6 @@ jobs:
104100
restore-keys: |
105101
${{ runner.os }}-bazel-medium-tests-
106102
${{ runner.os }}-bazel-build-
107-
- name: Setup bazelisk
108-
uses: ./.github/actions/setup-bazelisk
109103
- name: Setup Java
110104
uses: actions/setup-java@v1
111105
with:
@@ -133,8 +127,6 @@ jobs:
133127
restore-keys: |
134128
${{ runner.os }}-bazel-lint-
135129
${{ runner.os }}-bazel-build-
136-
- name: Setup bazelisk
137-
uses: ./.github/actions/setup-bazelisk
138130
- name: Setup Java
139131
uses: actions/setup-java@v1
140132
with:
@@ -169,8 +161,6 @@ jobs:
169161
restore-keys: |
170162
${{ runner.os }}-bazel-${{ matrix.browser }}-tests-
171163
${{ runner.os }}-bazel-build-
172-
- name: Setup bazelisk
173-
uses: ./.github/actions/setup-bazelisk
174164
- name: Setup Fluxbox
175165
run: sudo apt-get -y install fluxbox
176166
- name: Setup Java
@@ -227,8 +217,6 @@ jobs:
227217
${{ runner.os }}-bazel-${{ matrix.browser }}-server-tests-
228218
${{ runner.os }}-bazel-${{ matrix.browser }}-tests-
229219
${{ runner.os }}-bazel-build-
230-
- name: Setup bazelisk
231-
uses: ./.github/actions/setup-bazelisk
232220
- name: Setup Fluxbox
233221
run: sudo apt-get -y install fluxbox
234222
- name: Setup Java
@@ -276,8 +264,6 @@ jobs:
276264
restore-keys: |
277265
${{ runner.os }}-bazel-firefox-tests-
278266
${{ runner.os }}-bazel-build-
279-
- name: Setup bazelisk
280-
uses: ./.github/actions/setup-bazelisk
281267
- name: Setup Fluxbox
282268
run: sudo apt-get -y install fluxbox
283269
- name: Setup Java
@@ -317,8 +303,6 @@ jobs:
317303
restore-keys: |
318304
${{ runner.os }}-bazel-firefox-tests-
319305
${{ runner.os }}-bazel-build-
320-
- name: Setup bazelisk
321-
uses: ./.github/actions/setup-bazelisk
322306
- name: Setup Java
323307
uses: actions/setup-java@v1
324308
with:

‎.github/workflows/ci-javascript.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ jobs:
5151
uses: actions/setup-java@v1
5252
with:
5353
java-version: 11
54-
- name: Setup bazelisk
55-
uses: ./.github/actions/setup-bazelisk
5654
- name: Setup Fluxbox
5755
run: sudo apt-get -y install fluxbox
5856
- name: Setup Firefox and GeckoDriver
@@ -98,8 +96,6 @@ jobs:
9896
uses: actions/setup-java@v1
9997
with:
10098
java-version: 11
101-
- name: Setup bazelisk
102-
uses: ./.github/actions/setup-bazelisk
10399
- name: Setup Fluxbox
104100
run: sudo apt-get -y install fluxbox
105101
- name: Setup Firefox and GeckoDriver

‎.github/workflows/ci-python.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ jobs:
9898
key: ${{ runner.os }}-bazel-python-unit-tests-${{ hashFiles('**/BUILD.bazel') }}
9999
restore-keys: |
100100
${{ runner.os }}-bazel-python-unit-tests-
101-
- name: Setup bazelisk
102-
uses: ./.github/actions/setup-bazelisk
103101
- name: Set up Python 3.7
104102
uses: actions/setup-python@v2
105103
with:
@@ -130,8 +128,6 @@ jobs:
130128
restore-keys: |
131129
${{ runner.os }}-bazel-chrome-tests-
132130
${{ runner.os }}-bazel-python-unit-tests-
133-
- name: Setup bazelisk
134-
uses: ./.github/actions/setup-bazelisk
135131
- name: Setup Fluxbox
136132
run: sudo apt-get -y install fluxbox
137133
- name: Set up Python 3.7
@@ -173,8 +169,6 @@ jobs:
173169
restore-keys: |
174170
${{ runner.os }}-bazel-firefox-tests-
175171
${{ runner.os }}-bazel-python-unit-tests-
176-
- name: Setup bazelisk
177-
uses: ./.github/actions/setup-bazelisk
178172
- name: Setup Fluxbox
179173
run: sudo apt-get -y install fluxbox
180174
- name: Set up Python 3.7
@@ -215,8 +209,6 @@ jobs:
215209
restore-keys: |
216210
${{ runner.os }}-bazel-firefox-tests-
217211
${{ runner.os }}-bazel-python-unit-tests-
218-
- name: Setup bazelisk
219-
uses: ./.github/actions/setup-bazelisk
220212
- name: Setup Fluxbox
221213
run: sudo apt-get -y install fluxbox
222214
- name: Set up Python 3.7

‎.github/workflows/ci-ruby.yml

Lines changed: 66 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,27 @@ jobs:
2929
matrix:
3030
target: [ 'selenium-devtools', 'selenium-webdriver' ]
3131
steps:
32-
- uses: actions/checkout@v2
33-
- uses: actions/setup-java@v1
32+
- name: Checkout source tree
33+
uses: actions/checkout@v2
34+
- name: Setup Java
35+
uses: actions/setup-java@v1
3436
with:
3537
java-version: 11
36-
- uses: ruby/setup-ruby@v1
38+
- name: Setup Ruby
39+
uses: ruby/setup-ruby@v1
3740
with:
3841
ruby-version: 2.7
39-
- uses: actions/cache@v2
42+
- name: Cache Bazel artifacts
43+
uses: actions/cache@v2
4044
with:
4145
path: |
4246
~/.cache/bazel-disk
4347
~/.cache/bazel-repo
4448
key: ${{ runner.os }}-bazel-ruby-build-gem-${{ matrix.target }}-${{ hashFiles('**/BUILD.bazel') }}
4549
restore-keys: |
4650
${{ runner.os }}-bazel-ruby-build-gem-${{ matrix.target }}-
47-
- uses: ./.github/actions/setup-bazelisk
48-
- uses: ./.github/actions/bazel
51+
- name: Build Gems
52+
uses: ./.github/actions/bazel
4953
with:
5054
command: build //rb:${{ matrix.target }}
5155

@@ -58,29 +62,35 @@ jobs:
5862
matrix:
5963
target: [ 'chrome-test', 'remote-chrome-test' ]
6064
steps:
61-
- uses: actions/checkout@v2
62-
- uses: actions/setup-java@v1
65+
- name: Checkout source tree
66+
uses: actions/checkout@v2
67+
- name: Setup Java
68+
uses: actions/setup-java@v1
6369
with:
6470
java-version: 11
65-
- uses: ruby/setup-ruby@v1
71+
- name: Setup Ruby
72+
uses: ruby/setup-ruby@v1
6673
with:
6774
ruby-version: 2.7
68-
- uses: actions/cache@v2
75+
- name: Cache Bazel artifacts
76+
uses: actions/cache@v2
6977
with:
7078
path: |
7179
~/.cache/bazel-disk
7280
~/.cache/bazel-repo
7381
key: ${{ runner.os }}-bazel-ruby-${{ matrix.target }}-${{ hashFiles('**/BUILD.bazel') }}
7482
restore-keys: |
7583
${{ runner.os }}-bazel-ruby-${{ matrix.target }}-
76-
- uses: ./.github/actions/setup-bazelisk
7784
- name: Setup Fluxbox
7885
run: sudo apt-get -y install fluxbox
79-
- uses: ./.github/actions/setup-chrome
80-
- run: Xvfb :99 &
86+
- name: Setup Chrome
87+
uses: browser-actions/setup-chrome@latest
88+
- name: Start XVFB
89+
run: Xvfb :99 &
8190
- name: Start Fluxbox
8291
run: fluxbox -display :99 &
83-
- uses: ./.github/actions/bazel
92+
- name: Run Chrome tests
93+
uses: ./.github/actions/bazel
8494
with:
8595
command: test --test_output=all //rb:${{ matrix.target }}
8696
attempts: 3
@@ -96,30 +106,38 @@ jobs:
96106
matrix:
97107
target: [ 'firefox-test', 'remote-firefox-test' ]
98108
steps:
99-
- uses: actions/checkout@v2
100-
- uses: actions/setup-java@v1
109+
- name: Checkout source tree
110+
uses: actions/checkout@v2
111+
- name: Setup Java
112+
uses: actions/setup-java@v1
101113
with:
102114
java-version: 11
103-
- uses: ruby/setup-ruby@v1
115+
- name: Setup Ruby
116+
uses: ruby/setup-ruby@v1
104117
with:
105118
ruby-version: 2.7
106-
- uses: actions/cache@v2
119+
- name: Cache Bazel artifacts
120+
uses: actions/cache@v2
107121
with:
108122
path: |
109123
~/.cache/bazel-disk
110124
~/.cache/bazel-repo
111125
key: ${{ runner.os }}-bazel-ruby-${{ matrix.target }}-${{ hashFiles('**/BUILD.bazel') }}
112126
restore-keys: |
113127
${{ runner.os }}-bazel-ruby-${{ matrix.target }}-
114-
- uses: ./.github/actions/setup-bazelisk
115128
- name: Setup Fluxbox
116129
run: sudo apt-get -y install fluxbox
117-
- name: Setup Firefox and GeckoDriver
118-
uses: ./.github/actions/setup-firefox
119-
- run: Xvfb :99 &
130+
- name: Setup Firefox
131+
uses: abhi1693/[email protected]
132+
with:
133+
browser: firefox
134+
version: latest
135+
- name: Start XVFB
136+
run: Xvfb :99 &
120137
- name: Start Fluxbox
121138
run: fluxbox -display :99 &
122-
- uses: ./.github/actions/bazel
139+
- name: Run Firefox tests
140+
uses: ./.github/actions/bazel
123141
with:
124142
command: test --test_output=all //rb:${{ matrix.target }}
125143
attempts: 3
@@ -131,20 +149,23 @@ jobs:
131149
needs: check_workflow
132150
runs-on: ubuntu-latest
133151
steps:
134-
- uses: actions/checkout@v2
135-
- uses: ruby/setup-ruby@v1
152+
- name: Checkout source tree
153+
uses: actions/checkout@v2
154+
- name: Setup Ruby
155+
uses: ruby/setup-ruby@v1
136156
with:
137157
ruby-version: 2.7
138-
- uses: actions/cache@v2
158+
- name: Cache Bazel artifacts
159+
uses: actions/cache@v2
139160
with:
140161
path: |
141162
~/.cache/bazel-disk
142163
~/.cache/bazel-repo
143164
key: ${{ runner.os }}-bazel-ruby-docs-${{ hashFiles('**/BUILD.bazel') }}
144165
restore-keys: |
145166
${{ runner.os }}-bazel-ruby-${{ matrix.target }}-
146-
- uses: ./.github/actions/setup-bazelisk
147-
- uses: ./.github/actions/bazel
167+
- name: Run docs tests
168+
uses: ./.github/actions/bazel
148169
with:
149170
command: run //rb:docs
150171

@@ -153,20 +174,23 @@ jobs:
153174
needs: check_workflow
154175
runs-on: ubuntu-latest
155176
steps:
156-
- uses: actions/checkout@v2
157-
- uses: ruby/setup-ruby@v1
177+
- name: Checkout source tree
178+
uses: actions/checkout@v2
179+
- name: Setup Ruby
180+
uses: ruby/setup-ruby@v1
158181
with:
159182
ruby-version: 2.7
160-
- uses: actions/cache@v2
183+
- name: Cache Bazel artifacts
184+
uses: actions/cache@v2
161185
with:
162186
path: |
163187
~/.cache/bazel-disk
164188
~/.cache/bazel-repo
165189
key: ${{ runner.os }}-bazel-ruby-lint-${{ hashFiles('**/BUILD.bazel') }}
166190
restore-keys: |
167191
${{ runner.os }}-bazel-ruby-lint-
168-
- uses: ./.github/actions/setup-bazelisk
169-
- uses: ./.github/actions/bazel
192+
- name: Run lint tests
193+
uses: ./.github/actions/bazel
170194
with:
171195
command: run //rb:lint
172196

@@ -179,19 +203,22 @@ jobs:
179203
matrix:
180204
ruby: [ '2.7', '3.1' ]
181205
steps:
182-
- uses: actions/checkout@v2
183-
- uses: ruby/setup-ruby@v1
206+
- name: Checkout source tree
207+
uses: actions/checkout@v2
208+
- name: Setup Ruby
209+
uses: ruby/setup-ruby@v1
184210
with:
185-
ruby-version: ${{ matrix.ruby }}
186-
- uses: actions/cache@v2
211+
ruby-version: 2.7
212+
- name: Cache Bazel artifacts
213+
uses: actions/cache@v2
187214
with:
188215
path: |
189216
~/.cache/bazel-disk
190217
~/.cache/bazel-repo
191218
key: ${{ runner.os }}-bazel-ruby-unit-test-${{ matrix.ruby }}-${{ hashFiles('**/BUILD.bazel') }}
192219
restore-keys: |
193220
${{ runner.os }}-bazel-ruby-unit-test-${{ matrix.ruby }}-
194-
- uses: ./.github/actions/setup-bazelisk
195-
- uses: ./.github/actions/bazel
221+
- name: Run unit tests
222+
uses: ./.github/actions/bazel
196223
with:
197224
command: test --test_output=all //rb:unit-test

‎.github/workflows/should-workflow-run.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ jobs:
2828
uses: actions/checkout@v2
2929
with:
3030
fetch-depth: 50
31-
- name: Setup bazelisk
32-
uses: ./.github/actions/setup-bazelisk
3331
- name: Setup Java
3432
uses: actions/setup-java@v1
3533
with:

0 commit comments

Comments
 (0)