Skip to content

Commit db68b3c

Browse files
committed
ci: put jlpkg install behind a feature
1 parent 507ee3d commit db68b3c

File tree

2 files changed

+48
-48
lines changed

2 files changed

+48
-48
lines changed

.github/workflows/release.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,23 @@ jobs:
4040
include:
4141
- label: x86_64-pc-windows-msvc-windowsstore
4242
target: x86_64-pc-windows-msvc
43-
bins: --bin juliaup --bin julialauncher
43+
bins: --bin juliaup --bin julialauncher --bin jlpkg
4444
os: windows
45-
features: windowsstore,binjulialauncher
45+
features: windowsstore,binjulialauncher,jlpkg
4646
rustflags:
4747
toolchain: stable
4848
- label: x86_64-pc-windows-msvc-windowsappinstaller
4949
target: x86_64-pc-windows-msvc
50-
bins: --bin juliaup --bin julialauncher
50+
bins: --bin juliaup --bin julialauncher --bin jlpkg
5151
os: windows
52-
features: windowsappinstaller,binjulialauncher
52+
features: windowsappinstaller,binjulialauncher,jlpkg
5353
rustflags:
5454
toolchain: stable
5555
- label: x86_64-pc-windows-gnu-msi
5656
target: x86_64-pc-windows-gnu
57-
bins: --bin juliaup --bin julialauncher
57+
bins: --bin juliaup --bin julialauncher --bin jlpkg
5858
os: windows
59-
features: binjulialauncher
59+
features: binjulialauncher,jlpkg
6060
rustflags:
6161
toolchain: stable-gnu
6262
- label: x86_64-pc-windows-gnu-portable
@@ -68,9 +68,9 @@ jobs:
6868
toolchain: stable-gnu
6969
- label: i686-pc-windows-gnu-msi
7070
target: i686-pc-windows-gnu
71-
bins: --bin juliaup --bin julialauncher
71+
bins: --bin juliaup --bin julialauncher --bin jlpkg
7272
os: windows
73-
features: binjulialauncher
73+
features: binjulialauncher,jlpkg
7474
rustflags:
7575
toolchain: stable-i686-gnu
7676
- label: i686-pc-windows-gnu-portable
@@ -82,9 +82,9 @@ jobs:
8282
toolchain: stable-i686-gnu
8383
- label: x86_64-apple-darwin
8484
target: x86_64-apple-darwin
85-
bins: --bin juliaup --bin julialauncher --bin juliainstaller
85+
bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin jlpkg
8686
os: macos
87-
features: selfupdate,binjuliainstaller,binjulialauncher
87+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
8888
rustflags:
8989
toolchain: stable
9090
- label: x86_64-apple-darwin-portable
@@ -96,16 +96,16 @@ jobs:
9696
toolchain: stable
9797
- label: x86_64-unknown-linux-gnu
9898
target: x86_64-unknown-linux-gnu
99-
bins: --bin juliaup --bin julialauncher --bin juliainstaller
99+
bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin jlpkg
100100
os: ubuntu
101-
features: selfupdate,binjuliainstaller,binjulialauncher
101+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
102102
rustflags:
103103
toolchain: stable
104104
- label: x86_64-unknown-linux-musl
105105
target: x86_64-unknown-linux-musl
106-
bins: --bin juliaup --bin julialauncher --bin juliainstaller
106+
bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin jlpkg
107107
os: ubuntu
108-
features: selfupdate,binjuliainstaller,binjulialauncher
108+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
109109
rustflags: -C target-feature=+crt-static
110110
toolchain: stable
111111
- label: x86_64-unknown-linux-musl-portable
@@ -117,37 +117,37 @@ jobs:
117117
toolchain: stable
118118
- label: x86_64-unknown-freebsd
119119
target: x86_64-unknown-freebsd
120-
bins: --bin juliaup --bin julialauncher --bin juliainstaller
120+
bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin jlpkg
121121
os: ubuntu
122-
features: selfupdate,binjuliainstaller,binjulialauncher
122+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
123123
rustflags:
124124
toolchain: stable
125125
- label: i686-pc-windows-msvc-windowsstore
126126
target: i686-pc-windows-msvc
127-
bins: --bin juliaup --bin julialauncher
127+
bins: --bin juliaup --bin julialauncher --bin jlpkg
128128
os: windows
129-
features: windowsstore,binjulialauncher
129+
features: windowsstore,binjulialauncher,jlpkg
130130
rustflags:
131131
toolchain: stable
132132
- label: i686-pc-windows-msvc-windowsappinstaller
133133
target: i686-pc-windows-msvc
134-
bins: --bin juliaup --bin julialauncher
134+
bins: --bin juliaup --bin julialauncher --bin jlpkg
135135
os: windows
136-
features: windowsappinstaller,binjulialauncher
136+
features: windowsappinstaller,binjulialauncher,jlpkg
137137
rustflags:
138138
toolchain: stable
139139
- label: i686-unknown-linux-gnu
140140
target: i686-unknown-linux-gnu
141-
bins: --bin juliaup --bin julialauncher --bin juliainstaller
141+
bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin jlpkg
142142
os: ubuntu
143-
features: selfupdate,binjuliainstaller,binjulialauncher
143+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
144144
rustflags:
145145
toolchain: stable
146146
- label: i686-unknown-linux-musl
147147
target: i686-unknown-linux-musl
148-
bins: --bin juliaup --bin julialauncher --bin juliainstaller
148+
bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin jlpkg
149149
os: ubuntu
150-
features: selfupdate,binjuliainstaller,binjulialauncher
150+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
151151
rustflags: -C target-feature=+crt-static
152152
toolchain: stable
153153
- label: i686-unknown-linux-musl-portable
@@ -159,16 +159,16 @@ jobs:
159159
toolchain: stable
160160
- label: aarch64-unknown-linux-gnu
161161
target: aarch64-unknown-linux-gnu
162-
bins: --bin juliaup --bin julialauncher --bin juliainstaller
162+
bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin jlpkg
163163
os: ubuntu
164-
features: selfupdate,binjuliainstaller,binjulialauncher
164+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
165165
rustflags:
166166
toolchain: stable
167167
- label: aarch64-unknown-linux-musl
168168
target: aarch64-unknown-linux-musl
169-
bins: --bin juliaup --bin julialauncher --bin juliainstaller
169+
bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin jlpkg
170170
os: ubuntu
171-
features: selfupdate,binjuliainstaller,binjulialauncher
171+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
172172
rustflags: -C target-feature=+crt-static
173173
toolchain: stable
174174
- label: aarch64-unknown-linux-musl-portable
@@ -180,9 +180,9 @@ jobs:
180180
toolchain: stable
181181
- label: aarch64-apple-darwin
182182
target: aarch64-apple-darwin
183-
bins: --bin juliaup --bin julialauncher --bin juliainstaller
183+
bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin jlpkg
184184
os: macos
185-
features: selfupdate,binjuliainstaller,binjulialauncher
185+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
186186
rustflags:
187187
toolchain: stable
188188
- label: aarch64-apple-darwin-portable

.github/workflows/test.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,77 +39,77 @@ jobs:
3939
- label: x86_64-pc-windows-msvc-windowsstore
4040
target: x86_64-pc-windows-msvc
4141
os: windows
42-
features: windowsstore,binjuliainstaller,binjulialauncher
42+
features: windowsstore,binjuliainstaller,binjulialauncher,jlpkg
4343
rustflags:
4444
- label: x86_64-pc-windows-msvc-windowsappinstaller
4545
target: x86_64-pc-windows-msvc
4646
os: windows
47-
features: windowsappinstaller,binjuliainstaller,binjulialauncher
47+
features: windowsappinstaller,binjuliainstaller,binjulialauncher,jlpkg
4848
rustflags:
4949
- label: x86_64-pc-windows-gnu-msi
5050
target: x86_64-pc-windows-gnu
5151
os: windows
52-
features: windowsappinstaller,binjuliainstaller,binjulialauncher
52+
features: windowsappinstaller,binjuliainstaller,binjulialauncher,jlpkg
5353
rustflags:
5454
- label: i686-pc-windows-gnu-msi
5555
target: i686-pc-windows-gnu
5656
os: windows
57-
features: windowsappinstaller,binjuliainstaller,binjulialauncher
57+
features: windowsappinstaller,binjuliainstaller,binjulialauncher,jlpkg
5858
rustflags:
5959
- label: x86_64-apple-darwin
6060
target: x86_64-apple-darwin
6161
os: macos
62-
features: selfupdate,binjuliainstaller,binjulialauncher
62+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
6363
rustflags:
6464
- label: x86_64-unknown-linux-gnu
6565
target: x86_64-unknown-linux-gnu
6666
os: ubuntu
67-
features: selfupdate,binjuliainstaller,binjulialauncher
67+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
6868
rustflags:
6969
- label: x86_64-unknown-linux-musl
7070
target: x86_64-unknown-linux-musl
7171
os: ubuntu
72-
features: selfupdate,binjuliainstaller,binjulialauncher
72+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
7373
rustflags: -C target-feature=+crt-static
7474
- label: x86_64-unknown-freebsd
7575
target: x86_64-unknown-freebsd
7676
os: ubuntu
77-
features: selfupdate,binjuliainstaller,binjulialauncher
77+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
7878
rustflags:
7979
- label: i686-pc-windows-msvc-windowsstore
8080
target: i686-pc-windows-msvc
8181
os: windows
82-
features: windowsstore,binjuliainstaller,binjulialauncher
82+
features: windowsstore,binjuliainstaller,binjulialauncher,jlpkg
8383
rustflags:
8484
- label: i686-pc-windows-msvc-windowsappinstaller
8585
target: i686-pc-windows-msvc
8686
os: windows
87-
features: windowsappinstaller,binjuliainstaller,binjulialauncher
87+
features: windowsappinstaller,binjuliainstaller,binjulialauncher,jlpkg
8888
rustflags:
8989
- label: i686-unknown-linux-gnu
9090
target: i686-unknown-linux-gnu
9191
os: ubuntu
92-
features: selfupdate,binjuliainstaller,binjulialauncher
92+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
9393
rustflags:
9494
- label: i686-unknown-linux-musl
9595
target: i686-unknown-linux-musl
9696
os: ubuntu
97-
features: selfupdate,binjuliainstaller,binjulialauncher
97+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
9898
rustflags: -C target-feature=+crt-static
9999
- label: aarch64-unknown-linux-gnu
100100
target: aarch64-unknown-linux-gnu
101101
os: ubuntu
102-
features: selfupdate,binjuliainstaller,binjulialauncher
102+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
103103
rustflags:
104104
- label: aarch64-unknown-linux-musl
105105
target: aarch64-unknown-linux-musl
106106
os: ubuntu
107-
features: selfupdate,binjuliainstaller,binjulialauncher
107+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
108108
rustflags: -C target-feature=+crt-static
109109
- label: aarch64-apple-darwin
110110
target: aarch64-apple-darwin
111111
os: macos
112-
features: selfupdate,binjuliainstaller,binjulialauncher
112+
features: selfupdate,binjuliainstaller,binjulialauncher,jlpkg
113113
rustflags:
114114
steps:
115115
- uses: actions/checkout@v4
@@ -235,18 +235,18 @@ jobs:
235235
with:
236236
toolchain: stable
237237
- name: Build juliaup with jlpkg
238-
run: cargo build --release --features dummy,binjulialauncher
238+
run: cargo build --release --features dummy,binjulialauncher,jlpkg
239239
- name: Install Julia ${{ matrix.julia-channel }} via juliaup
240240
run: |
241241
./target/release/juliaup add ${{ matrix.julia-channel }}
242242
./target/release/juliaup default ${{ matrix.julia-channel }}
243243
shell: bash
244244
- name: Run jlpkg tests with Julia ${{ matrix.julia-channel }}
245-
run: cargo test --release --features dummy,binjulialauncher --test jlpkg_tests -- --nocapture
245+
run: cargo test --release --features dummy,binjulialauncher,jlpkg --test jlpkg_tests -- --nocapture
246246
env:
247247
RUST_BACKTRACE: 1
248248
- name: Run jlpkg parity tests with Julia ${{ matrix.julia-channel }} (Linux only)
249249
if: runner.os == 'Linux'
250-
run: cargo test --release --features dummy,binjulialauncher --test jlpkg_parity_test -- --nocapture
250+
run: cargo test --release --features dummy,binjulialauncher,jlpkg --test jlpkg_parity_test -- --nocapture
251251
env:
252252
RUST_BACKTRACE: 1

0 commit comments

Comments
 (0)