File tree 1 file changed +10
-0
lines changed 1 file changed +10
-0
lines changed Original file line number Diff line number Diff line change @@ -105,10 +105,15 @@ jobs:
105
105
submodules : recursive
106
106
ssh-key : ${{ secrets.SSH_KEY }}
107
107
108
+ <<<<<<< HEAD
108
109
-
uses :
bazel-contrib/[email protected]
109
110
with :
110
111
# Avoid downloading Bazel every time.
111
112
bazelisk-cache : true
113
+ =======
114
+ - name : Install bazelisk
115
+ uses : bazelbuild/setup-bazelisk@v3
116
+ >>>>>>> 52b612a (Bump bazelbuild/setup-bazelisk from 2 to 3)
112
117
113
118
- name : Mount bazel cache
114
119
uses : actions/cache@v4
@@ -130,10 +135,15 @@ jobs:
130
135
submodules : recursive
131
136
ssh-key : ${{ secrets.SSH_KEY }}
132
137
138
+ <<<<<<< HEAD
133
139
-
uses :
bazel-contrib/[email protected]
134
140
with :
135
141
# Avoid downloading Bazel every time.
136
142
bazelisk-cache : true
143
+ =======
144
+ - name : Install bazelisk
145
+ uses : bazelbuild/setup-bazelisk@v3
146
+ >>>>>>> 52b612a (Bump bazelbuild/setup-bazelisk from 2 to 3)
137
147
138
148
- name : Mount bazel cache
139
149
uses : actions/cache@v4
You can’t perform that action at this time.
0 commit comments