From 92710e0744c13326628262c9e28330719eda6c01 Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Sun, 8 May 2022 14:26:46 +0200
Subject: [PATCH] worker: bump core version
We are now building against core commit
9b2bb2b691dd7f0a9b69064f0e7449a8958f25fe[1].
This commit is not on core master branch! It is effectively master
commit 9530f384c8331a83bf68782d8daf6f16ee47c2a0 [2] but we had to
remove 1a4de925c48aace75ff364fbc85dc7d8ffac5924 [3] from the tree
because of not yet solved incompatibility (see #76 [4]) and we added a
commit to bump alpine verison to 3.15.
We deploy this because of the feature that allows add documentation not
only to algorithm's overloads but to whole algorithm ([5] in our tree,
[6] in master).
I hope this is an exceptional situation and we get #76 [4] fixed soon so we
don't have to dance around (and manage our core tree) it in the future.
[1]: https://gitlab.fit.cvut.cz/algorithms-library-toolkit/automata-library/commit/9b2bb2b691dd7f0a9b69064f0e7449a8958f25fe
[2]: https://gitlab.fit.cvut.cz/algorithms-library-toolkit/automata-library/commit/9530f384c8331a83bf68782d8daf6f16ee47c2a0
[3]: https://gitlab.fit.cvut.cz/algorithms-library-toolkit/automata-library/commit/1a4de925c48aace75ff364fbc85dc7d8ffac5924
[4]: https://gitlab.fit.cvut.cz/algorithms-library-toolkit/webui-client/issues/76
[5]: https://gitlab.fit.cvut.cz/algorithms-library-toolkit/automata-library/commit/5eac4f8aca04590033bbede465572269010259e3
[6]: https://gitlab.fit.cvut.cz/algorithms-library-toolkit/automata-library/commit/3ea7123406c206288d08801055386054b52ae2b0
---
.gitlab-ci.yml | 2 +-
worker/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 247c02fc..e5fd7449 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ image: gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/infrastructure/ci-dock
build:worker:
stage: build
- image: gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/webui-client/core-snapshot:0.0.0.r1498.g00d54e0ed
+ image: gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/webui-client/core-snapshot:0.0.0.r1499.g9b2bb2b69
before_script:
- apk add --no-cache curl && curl https://alt.fit.cvut.cz/repo/alpine/alt-dev-repo.sh | sh
- apk add --no-cache build-base cmake jsoncpp-dev pkgconf apr-dev spdlog-dev catch2 activemq-cpp-dev argparse
diff --git a/worker/Dockerfile b/worker/Dockerfile
index 1396e885..8287839d 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/webui-client/core-snapshot:0.0.0.r1498.g00d54e0ed
+ARG BASE_IMAGE=gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/webui-client/core-snapshot:0.0.0.r1499.g9b2bb2b69
#-----------------------------------------------------------------------------------------
--
GitLab