Skip to content

Commit 9289248

Browse files
alexjpwalkeralexjpwalker
committed
only banana
1 parent d49deb7 commit 9289248

File tree

2 files changed

+21
-42
lines changed

2 files changed

+21
-42
lines changed

‎.circleci/config.yml‎

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,6 @@ commands:
9999
- run: |
100100
curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain 1.86.0
101101
102-
install-glib-linux:
103-
steps:
104-
- run: |
105-
sleep 1
106-
# sudo apt-get update
107-
# sudo apt-get install -y libglib2.0-dev pkg-config
108-
109102
deploy-mac-snapshot:
110103
parameters:
111104
target-arch:
@@ -138,13 +131,7 @@ commands:
138131
corepack prepare pnpm@8.6.7 --activate
139132
pnpm build
140133
npx tauri build
141-
bazel run //:deploy-mac-<<parameters.target-arch>>-dmg --compilation_mode=opt \
142-
--define APPLE_CODE_SIGN=yes \
143-
--define APPLE_ID=$APPLE_ID \
144-
--define APPLE_ID_PASSWORD=$APPLE_ID_PASSWORD \
145-
--define APPLE_TEAM_ID=$APPLE_TEAM_ID \
146-
--define APPLE_CODE_SIGNING_CERT_PASSWORD=$APPLE_CODE_SIGNING_CERT_PASSWORD \
147-
--spawn_strategy=local -- release
134+
bazel run //:deploy-mac-<<parameters.target-arch>>-dmg -- release
148135
149136
deploy-linux-snapshot:
150137
parameters:
@@ -171,7 +158,7 @@ commands:
171158
sudo ln -sf /usr/bin/python3.8 /usr/bin/python3
172159
export PATH="/usr/bin:$PATH"
173160
npx tauri build
174-
bazel run //:deploy-linux-<<parameters.target-arch>>-appimage --compilation_mode=opt -- snapshot
161+
bazel run //:deploy-linux-<<parameters.target-arch>>-deb --compilation_mode=opt -- snapshot
175162
176163
deploy-linux-release:
177164
parameters:
@@ -198,7 +185,7 @@ commands:
198185
sudo ln -sf /usr/bin/python3.8 /usr/bin/python3
199186
export PATH="/usr/bin:$PATH"
200187
npx tauri build
201-
bazel run //:deploy-linux-<<parameters.target-arch>>-appimage --compilation_mode=opt -- release
188+
bazel run //:deploy-linux-<<parameters.target-arch>>-deb --compilation_mode=opt -- release
202189
203190
deploy-apt-snapshot:
204191
parameters:
@@ -289,7 +276,6 @@ jobs:
289276
- install-bazel-linux-arm64
290277
- install-node-modules
291278
- install-rust
292-
- install-glib-linux
293279
- deploy-linux-snapshot:
294280
target-arch: arm64
295281

@@ -301,7 +287,6 @@ jobs:
301287
- install-bazel-linux-x86_64
302288
- install-node-modules
303289
- install-rust
304-
- install-glib-linux
305290
- deploy-linux-snapshot:
306291
target-arch: x86_64
307292

@@ -313,7 +298,6 @@ jobs:
313298
- install-bazel-linux-arm64
314299
- install-node-modules
315300
- install-rust
316-
- install-glib-linux
317301
- deploy-apt-snapshot:
318302
target-arch: arm64
319303

@@ -325,7 +309,6 @@ jobs:
325309
- install-bazel-linux-x86_64
326310
- install-node-modules
327311
- install-rust
328-
- install-glib-linux
329312
- deploy-apt-snapshot:
330313
target-arch: x86_64
331314

@@ -386,7 +369,6 @@ jobs:
386369
- install-bazel-linux-arm64
387370
- install-node-modules
388371
- install-rust
389-
- install-glib-linux
390372
- deploy-linux-release:
391373
target-arch: arm64
392374

@@ -398,7 +380,6 @@ jobs:
398380
- install-bazel-linux-x86_64
399381
- install-node-modules
400382
- install-rust
401-
- install-glib-linux
402383
- deploy-linux-release:
403384
target-arch: x86_64
404385

@@ -410,7 +391,6 @@ jobs:
410391
- install-bazel-linux-arm64
411392
- install-node-modules
412393
- install-rust
413-
- install-glib-linux
414394
- deploy-apt-release:
415395
target-arch: arm64
416396

@@ -422,7 +402,6 @@ jobs:
422402
- install-bazel-linux-x86_64
423403
- install-node-modules
424404
- install-rust
425-
- install-glib-linux
426405
- deploy-apt-release:
427406
target-arch: x86_64
428407

@@ -476,31 +455,31 @@ workflows:
476455
- deploy-linux-arm64-snapshot:
477456
filters:
478457
branches:
479-
only: [master, development]
458+
only: [banana]
480459
- deploy-linux-x86_64-snapshot:
481460
filters:
482461
branches:
483-
only: [master, development]
462+
only: [banana]
484463
- deploy-mac-arm64-snapshot:
485464
filters:
486465
branches:
487-
only: [master, banana]
466+
only: [banana]
488467
- deploy-mac-x86_64-snapshot:
489468
filters:
490469
branches:
491-
only: [master, banana]
470+
only: [banana]
492471
- deploy-windows-x86_64-snapshot:
493472
filters:
494473
branches:
495-
only: [master, banana]
474+
only: [banana]
496475
- deploy-apt-arm64-snapshot:
497476
filters:
498477
branches:
499-
only: [master, banana]
478+
only: [banana]
500479
- deploy-apt-x86_64-snapshot:
501480
filters:
502481
branches:
503-
only: [master, banana]
482+
only: [banana]
504483
release:
505484
jobs:
506485
- deploy-linux-arm64-release:

‎BUILD‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ genrule(
8686
)
8787

8888
genrule(
89-
name = "native-artifact-linux-arm64-appimage",
89+
name = "native-artifact-linux-arm64-deb",
9090
outs = ["typedb-studio_3.4.0-e5a9c7d3f1b8426e8d3c4f7a7b9a1e34c1f5d27b_arm64.deb"], # replace with your actual output, e.g., .exe, .AppImage
9191
cmd = """
9292
cp src-tauri/target/release/bundle/deb/*.deb "$(OUTS)"
@@ -96,8 +96,8 @@ genrule(
9696
)
9797

9898
genrule(
99-
name = "native-artifact-linux-x86_64-appimage",
100-
outs = ["typedb-studio_3.4.0-e5a9c7d3f1b8426e8d3c4f7a7b9a1e34c1f5d27b_amd64.AppImage"], # replace with your actual output, e.g., .exe, .AppImage
99+
name = "native-artifact-linux-x86_64-deb",
100+
outs = ["typedb-studio_3.4.0-e5a9c7d3f1b8426e8d3c4f7a7b9a1e34c1f5d27b_amd64.deb"], # replace with your actual output, e.g., .exe, .AppImage
101101
cmd = """
102102
cp src-tauri/target/release/bundle/deb/*.deb "$(OUTS)"
103103
""",
@@ -260,10 +260,10 @@ deploy_artifact(
260260
)
261261

262262
deploy_artifact(
263-
name = "deploy-linux-x86_64-appimage",
264-
target = ":native-artifact-linux-x86_64-appimage",
263+
name = "deploy-linux-x86_64-deb",
264+
target = ":native-artifact-linux-x86_64-deb",
265265
artifact_group = "typedb-studio-linux-x86_64",
266-
artifact_name = "typedb-studio-linux-x86_64-{version}.AppImage",
266+
artifact_name = "typedb-studio-linux-x86_64-{version}.deb",
267267
snapshot = deployment['artifact']['snapshot']['upload'],
268268
release = deployment['artifact']['release']['upload'],
269269
version_file = ":VERSION",
@@ -272,10 +272,10 @@ deploy_artifact(
272272
)
273273

274274
deploy_artifact(
275-
name = "deploy-linux-arm64-appimage",
276-
target = ":native-artifact-linux-arm64-appimage",
275+
name = "deploy-linux-arm64-deb",
276+
target = ":native-artifact-linux-arm64-deb",
277277
artifact_group = "typedb-studio-linux-arm64",
278-
artifact_name = "typedb-studio-linux-arm64-{version}.AppImage",
278+
artifact_name = "typedb-studio-linux-arm64-{version}.deb",
279279
snapshot = deployment['artifact']['snapshot']['upload'],
280280
release = deployment['artifact']['release']['upload'],
281281
version_file = ":VERSION",
@@ -320,14 +320,14 @@ deploy_brew(
320320

321321
deploy_apt(
322322
name = "deploy-apt-x86_64",
323-
target = ":native-artifact-linux-x86_64-appimage",
323+
target = ":native-artifact-linux-x86_64-deb",
324324
snapshot = deployment['apt']['snapshot']['upload'],
325325
release = deployment['apt']['release']['upload'],
326326
)
327327

328328
deploy_apt(
329329
name = "deploy-apt-arm64",
330-
target = ":native-artifact-linux-arm64-appimage",
330+
target = ":native-artifact-linux-arm64-deb",
331331
snapshot = deployment['apt']['snapshot']['upload'],
332332
release = deployment['apt']['release']['upload'],
333333
)

0 commit comments

Comments
 (0)