Skip to content

Commit e1f319b

Browse files
committed
ci: switch to DeLaGuardo/clojure-setup for all
Not 100% sure this will work for us on Windows for native and unit tests. I was formerly using deps.clj binary for Windows for these. Back when I setup this up I think the default shell on Windows was cmd, but it has since changed to powershell.
1 parent d92d4db commit e1f319b

File tree

4 files changed

+22
-57
lines changed

4 files changed

+22
-57
lines changed

.github/workflows/code-coverage.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@ jobs:
2424
distribution: 'temurin'
2525
java-version: '11'
2626

27-
- name: Install babashka
28-
uses: turtlequeue/setup-[email protected].0
27+
- name: Install Clojure tools
28+
uses: DeLaGuardo/setup-clojure@5.0
2929
with:
30-
babashka-version: 0.7.8
31-
32-
- name: Install clojure
33-
run: curl -s https://download.clojure.org/install/linux-install-1.10.3.986.sh | sudo bash
30+
cli: 1.11.1.1105
31+
bb: 'latest'
32+
github-token: ${{ secrets.GITHUB_TOKEN }}
3433

3534
- name: Tools versions
3635
run: |

.github/workflows/native-image-test.yml

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,14 @@ jobs:
4242
github-token: ${{ secrets.GITHUB_TOKEN }}
4343

4444
#
45-
# Install Babashka
45+
# Install Clojure, Babashka
4646
#
47-
- name: Install babashka
48-
uses: turtlequeue/setup-[email protected].0
47+
- name: Install Clojure tools
48+
uses: DeLaGuardo/setup-clojure@5.0
4949
with:
50-
babashka-version: 0.7.8
51-
52-
#
53-
# Install Clojure
54-
#
55-
- name: Install clojure (windows)
56-
# On windows, deps.clj's deps.exe is used in place of clojure to avoid complexities of official clojure install
57-
run: |
58-
PowerShell -Command "iwr -useb https://raw.githubusercontent.com/borkdude/deps.clj/master/install.ps1 | iex"
59-
Rename-Item $HOME\deps.clj\deps.exe clojure.exe
60-
echo "$HOME\deps.clj" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
61-
if: matrix.os == 'windows-latest'
62-
- name: Install clojure (macos)
63-
run: brew install clojure/tools/clojure
64-
if: matrix.os == 'macos-latest'
65-
- name: Install clojure (linux)
66-
run: curl -s https://download.clojure.org/install/linux-install-1.10.3.986.sh | sudo bash
67-
if: matrix.os == 'ubuntu-latest'
68-
69-
- name: Bring down ClojureTools early
70-
run: clojure -Sdescribe
50+
cli: 1.11.1.1105
51+
bb: 'latest'
52+
github-token: ${{ secrets.GITHUB_TOKEN }}
7153

7254
#
7355
# Summarize installs

.github/workflows/release.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@ jobs:
3535
distribution: 'temurin'
3636
java-version: '11'
3737

38-
- name: Install babashka
39-
uses: turtlequeue/setup-[email protected].0
38+
- name: Install Clojure tools
39+
uses: DeLaGuardo/setup-clojure@5.0
4040
with:
41-
babashka-version: 0.7.8
42-
43-
- name: Install Clojure
44-
run: curl -s https://download.clojure.org/install/linux-install-1.10.3.986.sh | sudo bash
41+
cli: 1.11.1.1105
42+
bb: 'latest'
43+
github-token: ${{ secrets.GITHUB_TOKEN }}
4544

4645
- name: Tools Versions
4746
run: |

.github/workflows/unit-test.yml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -68,29 +68,14 @@ jobs:
6868
if: matrix.os == 'macos-latest'
6969

7070
#
71-
# Install Babashka
71+
# Install Clojure & Babashka
7272
#
73-
- name: Install babashka
74-
uses: turtlequeue/setup-[email protected].0
73+
- name: Install Clojure tools
74+
uses: DeLaGuardo/setup-clojure@5.0
7575
with:
76-
babashka-version: 0.7.8
77-
78-
#
79-
# Install Clojure
80-
#
81-
- name: Install clojure (windows)
82-
# On windows, deps.clj's deps.exe is used in place of clojure to avoid complexities of official clojure install
83-
run: |
84-
PowerShell -Command "iwr -useb https://raw.githubusercontent.com/borkdude/deps.clj/master/install.ps1 | iex"
85-
Rename-Item $HOME\deps.clj\deps.exe clojure.exe
86-
echo "$HOME\deps.clj" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
87-
if: matrix.os == 'windows-latest'
88-
- name: Install clojure (macos)
89-
run: brew install clojure/tools/clojure
90-
if: matrix.os == 'macos-latest'
91-
- name: Install clojure (linux)
92-
run: curl -s https://download.clojure.org/install/linux-install-1.10.3.986.sh | sudo bash
93-
if: matrix.os == 'ubuntu-latest'
76+
cli: 1.11.1.1105
77+
bb: 'latest'
78+
github-token: ${{ secrets.GITHUB_TOKEN }}
9479

9580
- name: Bring down ClojureTools early
9681
run: clojure -Sdescribe

0 commit comments

Comments
 (0)