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

Commit

Permalink
Fix apt deployment and typedb binary formatting (#155)
Browse files Browse the repository at this point in the history
## 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
  • Loading branch information
flyingsilverfin authored Oct 3, 2023
1 parent 351f662 commit 08b1003
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 30 deletions.
20 changes: 0 additions & 20 deletions .factory/automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@ build:
command: |
export DEPLOY_APT_USERNAME=$REPO_VATICLE_USERNAME
export DEPLOY_APT_PASSWORD=$REPO_VATICLE_PASSWORD
# Do not upgrade Python until bazelbuild/rules_pkg#397 is fixed
export PYENV_ROOT="/opt/pyenv"
pyenv install 3.7.9
pyenv global 3.7.9
sudo unlink /usr/bin/python3
sudo ln -s $(which python3) /usr/bin/python3
sudo ln -s /usr/share/pyshared/lsb_release.py /opt/pyenv/versions/3.7.9/lib/python3.7/site-packages/lsb_release.py
bazel run --define version=$(git rev-parse HEAD) //binary:deploy-apt -- snapshot
release:
filter:
Expand All @@ -85,13 +78,6 @@ release:
deploy-github:
image: vaticle-ubuntu-22.04
command: |
export PYENV_ROOT="/opt/pyenv"
pyenv install 3.7.9
pyenv global 3.7.9
sudo unlink /usr/bin/python3
sudo ln -s $(which python3) /usr/bin/python3
sudo ln -s /usr/share/pyshared/lsb_release.py /opt/pyenv/versions/3.7.9/lib/python3.7/site-packages/lsb_release.py
python3 -m pip install certifi
export NOTES_CREATE_TOKEN=$REPO_GITHUB_TOKEN
bazel run @vaticle_dependencies//tool/release/notes:create -- $FACTORY_OWNER $FACTORY_REPO $FACTORY_COMMIT $(cat VERSION) ./RELEASE_TEMPLATE.md ./RELEASE_TEMPLATE.md
export DEPLOY_GITHUB_TOKEN=$REPO_GITHUB_TOKEN
Expand All @@ -111,11 +97,5 @@ release:
cat VERSION
export DEPLOY_APT_USERNAME=$REPO_VATICLE_USERNAME
export DEPLOY_APT_PASSWORD=$REPO_VATICLE_PASSWORD
# Do not upgrade Python until bazelbuild/rules_pkg#397 is fixed
export PYENV_ROOT="/opt/pyenv"
pyenv install 3.7.9
pyenv global 3.7.9
sudo unlink /usr/bin/python3
sudo ln -s $(which python3) /usr/bin/python3
sudo ln -s /usr/share/pyshared/lsb_release.py /opt/pyenv/versions/3.7.9/lib/python3.7/site-packages/lsb_release.py
bazel run --define version=$(cat VERSION) //binary:deploy-apt -- release
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.24.5
2.24.10
10 changes: 4 additions & 6 deletions binary/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,15 @@ assemble_apt(
empty_dirs = [
"var/log/typedb/",
],
depends = [
"openjdk-11-jre"
],
permissions = {
"var/log/typedb/": "0777",
},
empty_dirs_permission = "0777",
symlinks = {
"usr/local/bin/typedb": "/opt/typedb/core/typedb",
"opt/typedb/core/server/logs": "/var/log/typedb/",
"usr/lib/systemd/system/typedb.service": "/opt/typedb/core/typedb.service",
},
depends = [
"openjdk-11-jre"
],
)

deploy_apt(
Expand Down
2 changes: 1 addition & 1 deletion binary/typedb
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ exit_if_java_not_found
if [ -z "$1" ]; then
echo "Missing argument. Possible commands are:"
echo " Server: typedb server [--help]"
echo " Enterprise: typedb enterprise [--help]"
echo " Enterprise: typedb enterprise [--help]"
echo " Console: typedb console [--help]"
exit 1
elif [ "$1" = "console" ]; then
Expand Down
2 changes: 1 addition & 1 deletion binary/typedb.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ goto exiterror

echo Missing argument. Possible commands are:
echo Server: typedb server [--help]
echo Enterprise: typedb enterprise [--help]
echo Enterprise: typedb enterprise [--help]
echo Console: typedb console [--help]

goto exiterror
Expand Down
2 changes: 1 addition & 1 deletion dependencies/vaticle/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ def vaticle_dependencies():
git_repository(
name = "vaticle_dependencies",
remote = "https://github.com/vaticle/dependencies",
commit = "bbaa05b2b5f7afd304c0b070a17d202893c08562", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
commit = "5bf5826067d9a371efc2144343cd4f5c2649ee8e", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
)

0 comments on commit 08b1003

Please sign in to comment.