Skip to content

Commit e48764f

Browse files
Remove APT deployment and targets
1 parent cc3f48a commit e48764f

File tree

3 files changed

+2
-138
lines changed

3 files changed

+2
-138
lines changed

.circleci/config.yml

Lines changed: 1 addition & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -116,30 +116,6 @@ jobs:
116116
- run: .circleci\windows\prepare.bat
117117
- run: .circleci\windows\deploy_snapshot.bat
118118

119-
deploy-apt-snapshot-x86_64:
120-
executor: linux-x86_64
121-
steps:
122-
- checkout
123-
- install-bazel-linux:
124-
arch: amd64
125-
- run: |
126-
export DEPLOY_APT_USERNAME=$REPO_VATICLE_USERNAME
127-
export DEPLOY_APT_PASSWORD=$REPO_VATICLE_PASSWORD
128-
bazel run @vaticle_dependencies//tool/bazelinstall:remote_cache_setup.sh
129-
bazel run --define version=$(git rev-parse HEAD) //:deploy-apt-x86_64 -- snapshot
130-
131-
deploy-apt-snapshot-arm64:
132-
executor: linux-arm64
133-
steps:
134-
- checkout
135-
- install-bazel-linux:
136-
arch: arm64
137-
- run: |
138-
export DEPLOY_APT_USERNAME=$REPO_VATICLE_USERNAME
139-
export DEPLOY_APT_PASSWORD=$REPO_VATICLE_PASSWORD
140-
bazel run @vaticle_dependencies//tool/bazelinstall:remote_cache_setup.sh
141-
bazel run --define version=$(git rev-parse HEAD) //:deploy-apt-arm64 -- snapshot
142-
143119
deploy-artifact-release-linux-x86_64:
144120
executor: linux-x86_64
145121
steps:
@@ -223,42 +199,6 @@ jobs:
223199
root: dist
224200
paths: [ "./*" ]
225201

226-
deploy-apt-release-x86_64:
227-
executor: linux-x86_64
228-
steps:
229-
- checkout
230-
- install-bazel-linux:
231-
arch: amd64
232-
- run: |
233-
export DEPLOY_APT_USERNAME=$REPO_VATICLE_USERNAME
234-
export DEPLOY_APT_PASSWORD=$REPO_VATICLE_PASSWORD
235-
bazel run @vaticle_dependencies//tool/bazelinstall:remote_cache_setup.sh
236-
bazel run --define version=$(cat VERSION) //:deploy-apt-x86_64 --compilation_mode=opt -- release
237-
- run: |
238-
mkdir -p ~/dist
239-
cp bazel-bin/typedb-console__amd64.deb ~/dist/typedb-console__amd64.deb
240-
- persist_to_workspace:
241-
root: ~/dist
242-
paths: ["./*"]
243-
244-
deploy-apt-release-arm64:
245-
executor: linux-arm64
246-
steps:
247-
- checkout
248-
- install-bazel-linux:
249-
arch: arm64
250-
- run: |
251-
export DEPLOY_APT_USERNAME=$REPO_VATICLE_USERNAME
252-
export DEPLOY_APT_PASSWORD=$REPO_VATICLE_PASSWORD
253-
bazel run @vaticle_dependencies//tool/bazelinstall:remote_cache_setup.sh
254-
bazel run --define version=$(cat VERSION) //:deploy-apt-arm64 --compilation_mode=opt -- release
255-
- run: |
256-
mkdir -p ~/dist
257-
cp bazel-bin/typedb-console__arm64.deb ~/dist/typedb-console__arm64.deb
258-
- persist_to_workspace:
259-
root: ~/dist
260-
paths: ["./*"]
261-
262202
deploy-github:
263203
executor: linux-x86_64
264204
steps:
@@ -306,14 +246,7 @@ workflows:
306246
filters:
307247
branches:
308248
only: master
309-
- deploy-apt-snapshot-x86_64:
310-
filters:
311-
branches:
312-
only: master
313-
- deploy-apt-snapshot-arm64:
314-
filters:
315-
branches:
316-
only: master
249+
317250
release:
318251
jobs:
319252
- deploy-artifact-release-linux-x86_64:
@@ -336,14 +269,6 @@ workflows:
336269
filters:
337270
branches:
338271
only: [release]
339-
- deploy-apt-release-x86_64:
340-
filters:
341-
branches:
342-
only: [release]
343-
- deploy-apt-release-arm64:
344-
filters:
345-
branches:
346-
only: [release]
347272
- deploy-github:
348273
filters:
349274
branches:
@@ -354,8 +279,6 @@ workflows:
354279
- deploy-artifact-release-mac-x86_64
355280
- deploy-artifact-release-mac-arm64
356281
- deploy-artifact-release-windows-x86_64
357-
- deploy-apt-release-x86_64
358-
- deploy-apt-release-arm64
359282
- release-cleanup:
360283
filters:
361284
branches:

BUILD

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ load("@rules_pkg//:pkg.bzl", "pkg_tar")
2121
load("@vaticle_bazel_distribution//artifact:rules.bzl", "deploy_artifact")
2222
load("@vaticle_bazel_distribution//common:rules.bzl", "assemble_targz", "java_deps", "assemble_zip", "assemble_versioned")
2323
load("@vaticle_bazel_distribution//github:rules.bzl", "deploy_github")
24-
load("@vaticle_bazel_distribution//apt:rules.bzl", "assemble_apt", "deploy_apt")
2524
load("@vaticle_dependencies//distribution:deployment.bzl", "deployment")
2625
load("@vaticle_dependencies//tool/checkstyle:rules.bzl", "checkstyle_test")
2726
load("@vaticle_dependencies//tool/release/deps:rules.bzl", "release_validate_deps")
@@ -183,64 +182,6 @@ deploy_artifact(
183182
visibility = ["//visibility:public"],
184183
)
185184

186-
assemble_apt(
187-
name = "assemble-linux-x86_64-apt",
188-
package_name = "typedb-console",
189-
maintainer = "Vaticle <[email protected]>",
190-
description = "TypeDB (console)",
191-
depends = [
192-
"openjdk-11-jre",
193-
"typedb-bin (>=%{@vaticle_typedb_common})"
194-
],
195-
workspace_refs = "@vaticle_typedb_console_workspace_refs//:refs.json",
196-
files = {
197-
"//conf/logback:logback.xml": "console/conf/logback.xml"
198-
},
199-
archives = [":console-deps-native"],
200-
installation_dir = "/opt/typedb/core/",
201-
empty_dirs = [
202-
"opt/typedb/core/console/lib/",
203-
],
204-
architecture = "amd64",
205-
target_compatible_with = constraint_linux_x86_64,
206-
)
207-
208-
assemble_apt(
209-
name = "assemble-linux-arm64-apt",
210-
package_name = "typedb-console",
211-
maintainer = "Vaticle <[email protected]>",
212-
description = "TypeDB (console)",
213-
depends = [
214-
"openjdk-11-jre",
215-
"typedb-bin (>=%{@vaticle_typedb_common})"
216-
],
217-
workspace_refs = "@vaticle_typedb_console_workspace_refs//:refs.json",
218-
files = {
219-
"//conf/logback:logback.xml": "console/conf/logback.xml"
220-
},
221-
archives = [":console-deps-native"],
222-
installation_dir = "/opt/typedb/core/",
223-
empty_dirs = [
224-
"opt/typedb/core/console/lib/",
225-
],
226-
architecture = "arm64",
227-
target_compatible_with = constraint_linux_arm64,
228-
)
229-
230-
deploy_apt(
231-
name = "deploy-apt-x86_64",
232-
target = ":assemble-linux-x86_64-apt",
233-
snapshot = deployment['apt.snapshot'],
234-
release = deployment['apt.release'],
235-
)
236-
237-
deploy_apt(
238-
name = "deploy-apt-arm64",
239-
target = ":assemble-linux-arm64-apt",
240-
snapshot = deployment['apt.snapshot'],
241-
release = deployment['apt.release'],
242-
)
243-
244185
release_validate_deps(
245186
name = "release-validate-deps",
246187
refs = "@vaticle_typedb_console_workspace_refs//:refs.json",

dependencies/vaticle/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ def vaticle_typedb_driver():
3535
git_repository(
3636
name = "vaticle_typedb_driver",
3737
remote = "https://github.com/vaticle/typedb-driver",
38-
tag = "2.25.0", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_driver
38+
tag = "2.25.2", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_driver
3939
)

0 commit comments

Comments
 (0)