Skip to content

Commit b8021b7

Browse files
authored
Replace Makefile and MS-Windows scripts with bb tasks (#1232)
* Replace Makefile and MS-Windows scripts with bb tasks * remove changelog entry Co-authored-by: ikappaki <ikappaki@users.noreply.github.com>
1 parent f261415 commit b8021b7

File tree

14 files changed

+216
-200
lines changed

14 files changed

+216
-200
lines changed

.cirrus.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ task:
1212
GITHUB_TOKEN: ENCRYPTED[26786ca53221eb81db22b2ed4ebfde12d3765204867931bfad580dd31a0d677fce9df4da487c5b6969ac3397af638c7e]
1313
script: |
1414
sudo scripts/install-clojure /usr/local
15+
sudo bash < <(curl -s https://raw.githubusercontent.com/babashka/babashka/master/install)
1516
1617
pushd ~
1718
if ! [ -d graalvm-ce-java11-22.2.0 ]; then
@@ -24,14 +25,12 @@ task:
2425
2526
gu install native-image || true
2627
27-
make native-cli
28+
bb native-cli
2829
2930
arch=${CLOJURE_LSP_ARCH:-amd64}
3031
archive="clojure-lsp-native-macos-$arch.zip"
3132
zip "$archive" clojure-lsp
3233
33-
sudo bash < <(curl -s https://raw.githubusercontent.com/babashka/babashka/master/install)
34-
3534
bb release-artifact "$archive" || true
3635
binaries_artifacts:
3736
path: "clojure-lsp-*.zip"

.github/workflows/bump_downstreams.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ jobs:
2222
uses: DeLaGuardo/setup-clojure@master
2323
with:
2424
cli: '1.10.3.1013'
25+
bb: '0.9.161'
2526

2627
- name: Deploy clojars
2728
env:
2829
CLOJARS_USERNAME: ${{ secrets.CLOJARS_USERNAME }}
2930
CLOJARS_PASSWORD: ${{ secrets.CLOJARS_PASSWORD }}
3031
run: |
31-
make deploy-clojars
32+
bb deploy-clojars
3233
3334
release-clojars-standalone:
3435
name: Release standalone artifact to Clojars
@@ -51,7 +52,7 @@ jobs:
5152
CLOJARS_USERNAME: ${{ secrets.CLOJARS_USERNAME }}
5253
CLOJARS_PASSWORD: ${{ secrets.CLOJARS_PASSWORD }}
5354
run: |
54-
make deploy-clojars-standalone
55+
bb deploy-clojars-standalone
5556
5657
5758
bump-homebrew-formula:

.github/workflows/ci.yml

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,16 @@ jobs:
3232
uses: DeLaGuardo/setup-clojure@master
3333
with:
3434
cli: '1.10.3.1013'
35-
36-
- name: Install Babashka
37-
run: curl -s https://raw.githubusercontent.com/borkdude/babashka/master/install | sudo bash
35+
bb: '0.9.161'
3836

3937
- name: Check if namespaces are clean
40-
run: make lint-clean
38+
run: bb lint-clean
4139

4240
- name: Check if namespaces are formatted
43-
run: make lint-format
41+
run: bb lint-format
4442

4543
- name: Check if namespaces have no diagnostics
46-
run: make lint-diagnostics
44+
run: bb lint-diagnostics
4745

4846
unit-test:
4947
runs-on: ubuntu-latest
@@ -65,9 +63,10 @@ jobs:
6563
uses: DeLaGuardo/setup-clojure@master
6664
with:
6765
cli: '1.10.3.1013'
66+
bb: '0.9.161'
6867

6968
- name: Run tests
70-
run: make test
69+
run: bb test
7170

7271
jvm-integration-test:
7372
runs-on: ubuntu-latest
@@ -94,13 +93,13 @@ jobs:
9493
bb: '0.9.161'
9594

9695
- name: Generate embedded binary
97-
run: make prod-cli
96+
run: bb prod-cli
9897

9998
- name: Run integration tests
100-
run: make integration-test
99+
run: bb integration-test
101100

102101
- name: Run babashka pod tests
103-
run: make pod-test
102+
run: bb pod-test
104103

105104
jvm-integration-test-windows:
106105
runs-on: windows-2022
@@ -135,18 +134,13 @@ jobs:
135134
- name: Generate embedded binary
136135
env:
137136
LAUNCH4J_HOME: "C:\\Program Files (x86)\\Launch4j"
138-
run: |
139-
cd cli
140-
clojure -T:build prod-cli
137+
run: bb prod-cli
138+
141139
- name: Run integration tests
142-
run: |
143-
cd cli
144-
bb integration-test ../clojure-lsp.exe
140+
run: bb integration-test
145141

146142
- name: Run babashka pod tests
147-
run: |
148-
cd cli
149-
clojure -M:pod-test
143+
run: bb pod-test
150144

151145
graalvm-build:
152146
runs-on: ubuntu-latest
@@ -163,9 +157,7 @@ jobs:
163157
uses: DeLaGuardo/setup-clojure@master
164158
with:
165159
cli: '1.10.3.1013'
166-
167-
- name: Install Babashka
168-
run: curl -s https://raw.githubusercontent.com/borkdude/babashka/master/install | sudo bash
160+
bb: '0.9.161'
169161

170162
- uses: graalvm/setup-graalvm@v1
171163
with:
@@ -181,7 +173,7 @@ jobs:
181173
CLOJURE_LSP_STATIC: true
182174
CLOJURE_LSP_MUSL: true
183175
run: |
184-
make native-cli
176+
bb native-cli
185177
186178
- name: Compress binary
187179
uses: svenstaro/upx-action@v2
@@ -223,7 +215,7 @@ jobs:
223215
- name: Run babashka pod tests
224216
env:
225217
CLOJURE_LSP_TEST_ENV: native
226-
run: make pod-test
218+
run: bb pod-test
227219

228220
- name: Run integration tests
229-
run: make integration-test
221+
run: bb integration-test

.github/workflows/nightly.yml

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,14 @@ jobs:
6464
uses: DeLaGuardo/setup-clojure@master
6565
with:
6666
cli: '1.10.3.1013'
67+
bb: '0.9.161'
6768

6869
- name: Update nightly version
6970
run: |
7071
echo ${{ needs.release-dev-build.outputs.tag}} > lib/resources/CLOJURE_LSP_VERSION
7172
7273
- name: Generate jar for native
73-
run: make cli-jar-for-native
74+
run: bb cli-jar-for-native
7475

7576
# Remove after all places are using clojure-lsp-dev-builds
7677
- name: Upload jar
@@ -110,11 +111,7 @@ jobs:
110111
uses: DeLaGuardo/setup-clojure@master
111112
with:
112113
cli: '1.10.3.1013'
113-
114-
- name: Install Babashka
115-
uses: turtlequeue/setup-babashka@v1.3.0
116-
with:
117-
babashka-version: 0.7.8
114+
bb: '0.9.161'
118115

119116
- name: Install GraalVM
120117
uses: DeLaGuardo/setup-graalvm@master
@@ -131,7 +128,7 @@ jobs:
131128
CLOJURE_LSP_JAR: "../clojure-lsp-standalone.jar"
132129
CLOJURE_LSP_XMX: "-J-Xmx6g"
133130
run: |
134-
make native-cli
131+
bb native-cli
135132
136133
- name: Compress binary
137134
uses: svenstaro/upx-action@v2
@@ -174,11 +171,7 @@ jobs:
174171
uses: DeLaGuardo/setup-clojure@master
175172
with:
176173
cli: '1.10.3.1013'
177-
178-
- name: Install Babashka
179-
uses: turtlequeue/setup-babashka@v1.3.0
180-
with:
181-
babashka-version: 0.7.8
174+
bb: '0.9.161'
182175

183176
- uses: graalvm/setup-graalvm@v1
184177
with:
@@ -195,7 +188,7 @@ jobs:
195188
CLOJURE_LSP_STATIC: true
196189
CLOJURE_LSP_MUSL: true
197190
run: |
198-
make native-cli
191+
bb native-cli
199192
200193
- name: Compress binary
201194
uses: svenstaro/upx-action@v2
@@ -238,11 +231,7 @@ jobs:
238231
uses: DeLaGuardo/setup-clojure@master
239232
with:
240233
cli: '1.10.3.1013'
241-
242-
- name: Install Babashka
243-
uses: turtlequeue/setup-babashka@v1.3.0
244-
with:
245-
babashka-version: 0.7.8
234+
bb: '0.9.161'
246235

247236
- name: Install GraalVM
248237
uses: DeLaGuardo/setup-graalvm@master
@@ -259,7 +248,7 @@ jobs:
259248
CLOJURE_LSP_JAR: "../clojure-lsp-standalone.jar"
260249
CLOJURE_LSP_XMX: "-J-Xmx6g"
261250
run: |
262-
make native-cli
251+
bb native-cli
263252
264253
# Remove after all places are using clojure-lsp-dev-builds
265254
- name: Upload
@@ -305,13 +294,10 @@ jobs:
305294
java-version: 11
306295

307296
- name: Install Clojure
308-
run: |
309-
iwr -useb download.clojure.org/install/win-install-1.10.3.1013.ps1 | iex
310-
311-
- name: Install Babashka
312-
uses: turtlequeue/setup-babashka@v1.3.0
297+
uses: DeLaGuardo/setup-clojure@master
313298
with:
314-
babashka-version: 0.7.8
299+
cli: '1.10.3.1013'
300+
bb: '0.9.161'
315301

316302
- name: Install MSVC
317303
uses: ilammy/msvc-dev-cmd@v1
@@ -326,20 +312,12 @@ jobs:
326312
run: |
327313
gu.cmd install native-image
328314
329-
- name: Install make
330-
uses: crazy-max/ghaction-chocolatey@v1
331-
with:
332-
args: install make
333-
334315
- name: Build Windows native image
335316
env:
336317
CLOJURE_LSP_JAR: ..\clojure-lsp-standalone.jar
337318
CLOJURE_LSP_XMX: "-J-Xmx7g"
338319
run: |
339-
cd cli
340-
.\graalvm\native-windows-compile.bat
341-
mv clojure-lsp.exe ..\
342-
cd ..\
320+
bb native-cli
343321
344322
- name: Compress binary
345323
uses: svenstaro/upx-action@v2

0 commit comments

Comments
 (0)