From 08b10030433b5916127eaab9cd765052cf3fb90f Mon Sep 17 00:00:00 2001 From: Joshua Send Date: Tue, 3 Oct 2023 17:25:53 +0100 Subject: [PATCH] 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 --- .factory/automation.yml | 20 -------------------- VERSION | 2 +- binary/BUILD | 10 ++++------ binary/typedb | 2 +- binary/typedb.bat | 2 +- dependencies/vaticle/repositories.bzl | 2 +- 6 files changed, 8 insertions(+), 30 deletions(-) diff --git a/.factory/automation.yml b/.factory/automation.yml index 374c0687..adae003d 100644 --- a/.factory/automation.yml +++ b/.factory/automation.yml @@ -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: @@ -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 @@ -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 diff --git a/VERSION b/VERSION index 23a93836..588b4a3c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.24.5 +2.24.10 diff --git a/binary/BUILD b/binary/BUILD index 87828d5d..d20e1433 100644 --- a/binary/BUILD +++ b/binary/BUILD @@ -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( diff --git a/binary/typedb b/binary/typedb index 81801d75..22205886 100755 --- a/binary/typedb +++ b/binary/typedb @@ -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 diff --git a/binary/typedb.bat b/binary/typedb.bat index e421870c..47e829a5 100644 --- a/binary/typedb.bat +++ b/binary/typedb.bat @@ -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 diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index eb41245c..3b76c715 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -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 )