Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit 08b1003

Browse files
Fix apt deployment and typedb binary formatting (#155)
## What is the goal of this PR? We update VERSION to 2.24.10, which will include correctly formatted bootup messages and a fixed apt deployment. ## What are the changes implemented in this PR? * Use updated apt-deployment rules * Fix formatting in typedb-binaries * Remove no longer necessary Python overrides in automation.yml
1 parent 351f662 commit 08b1003

File tree

6 files changed

+8
-30
lines changed

6 files changed

+8
-30
lines changed

.factory/automation.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,6 @@ build:
6969
command: |
7070
export DEPLOY_APT_USERNAME=$REPO_VATICLE_USERNAME
7171
export DEPLOY_APT_PASSWORD=$REPO_VATICLE_PASSWORD
72-
# Do not upgrade Python until bazelbuild/rules_pkg#397 is fixed
73-
export PYENV_ROOT="/opt/pyenv"
74-
pyenv install 3.7.9
75-
pyenv global 3.7.9
76-
sudo unlink /usr/bin/python3
77-
sudo ln -s $(which python3) /usr/bin/python3
78-
sudo ln -s /usr/share/pyshared/lsb_release.py /opt/pyenv/versions/3.7.9/lib/python3.7/site-packages/lsb_release.py
7972
bazel run --define version=$(git rev-parse HEAD) //binary:deploy-apt -- snapshot
8073
release:
8174
filter:
@@ -85,13 +78,6 @@ release:
8578
deploy-github:
8679
image: vaticle-ubuntu-22.04
8780
command: |
88-
export PYENV_ROOT="/opt/pyenv"
89-
pyenv install 3.7.9
90-
pyenv global 3.7.9
91-
sudo unlink /usr/bin/python3
92-
sudo ln -s $(which python3) /usr/bin/python3
93-
sudo ln -s /usr/share/pyshared/lsb_release.py /opt/pyenv/versions/3.7.9/lib/python3.7/site-packages/lsb_release.py
94-
python3 -m pip install certifi
9581
export NOTES_CREATE_TOKEN=$REPO_GITHUB_TOKEN
9682
bazel run @vaticle_dependencies//tool/release/notes:create -- $FACTORY_OWNER $FACTORY_REPO $FACTORY_COMMIT $(cat VERSION) ./RELEASE_TEMPLATE.md ./RELEASE_TEMPLATE.md
9783
export DEPLOY_GITHUB_TOKEN=$REPO_GITHUB_TOKEN
@@ -111,11 +97,5 @@ release:
11197
cat VERSION
11298
export DEPLOY_APT_USERNAME=$REPO_VATICLE_USERNAME
11399
export DEPLOY_APT_PASSWORD=$REPO_VATICLE_PASSWORD
114-
# Do not upgrade Python until bazelbuild/rules_pkg#397 is fixed
115-
export PYENV_ROOT="/opt/pyenv"
116-
pyenv install 3.7.9
117-
pyenv global 3.7.9
118-
sudo unlink /usr/bin/python3
119-
sudo ln -s $(which python3) /usr/bin/python3
120100
sudo ln -s /usr/share/pyshared/lsb_release.py /opt/pyenv/versions/3.7.9/lib/python3.7/site-packages/lsb_release.py
121101
bazel run --define version=$(cat VERSION) //binary:deploy-apt -- release

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.24.5
1+
2.24.10

binary/BUILD

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,15 @@ assemble_apt(
5959
empty_dirs = [
6060
"var/log/typedb/",
6161
],
62-
depends = [
63-
"openjdk-11-jre"
64-
],
65-
permissions = {
66-
"var/log/typedb/": "0777",
67-
},
62+
empty_dirs_permission = "0777",
6863
symlinks = {
6964
"usr/local/bin/typedb": "/opt/typedb/core/typedb",
7065
"opt/typedb/core/server/logs": "/var/log/typedb/",
7166
"usr/lib/systemd/system/typedb.service": "/opt/typedb/core/typedb.service",
7267
},
68+
depends = [
69+
"openjdk-11-jre"
70+
],
7371
)
7472

7573
deploy_apt(

binary/typedb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ exit_if_java_not_found
4646
if [ -z "$1" ]; then
4747
echo "Missing argument. Possible commands are:"
4848
echo " Server: typedb server [--help]"
49-
echo " Enterprise: typedb enterprise [--help]"
49+
echo " Enterprise: typedb enterprise [--help]"
5050
echo " Console: typedb console [--help]"
5151
exit 1
5252
elif [ "$1" = "console" ]; then

binary/typedb.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ goto exiterror
4343

4444
echo Missing argument. Possible commands are:
4545
echo Server: typedb server [--help]
46-
echo Enterprise: typedb enterprise [--help]
46+
echo Enterprise: typedb enterprise [--help]
4747
echo Console: typedb console [--help]
4848

4949
goto exiterror

dependencies/vaticle/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ def vaticle_dependencies():
2121
git_repository(
2222
name = "vaticle_dependencies",
2323
remote = "https://github.com/vaticle/dependencies",
24-
commit = "bbaa05b2b5f7afd304c0b070a17d202893c08562", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
24+
commit = "5bf5826067d9a371efc2144343cd4f5c2649ee8e", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
2525
)

0 commit comments

Comments
 (0)