From c8fb4505447f2897152270fd7a194357d396f703 Mon Sep 17 00:00:00 2001 From: Jiri Kozel Date: Thu, 19 Dec 2024 11:47:04 +0100 Subject: [PATCH] WIP: build timgen image in GitHub Actions --- .github/workflows/dynamic_tests.yml | 1 + .github/workflows/main.yml | 1 + .github/workflows/optional_tests.yml | 1 + Makefile | 2 -- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dynamic_tests.yml b/.github/workflows/dynamic_tests.yml index a375cb0ab..4a946d1f0 100644 --- a/.github/workflows/dynamic_tests.yml +++ b/.github/workflows/dynamic_tests.yml @@ -32,6 +32,7 @@ jobs: run: | cp .env.test .env make pull-dev-images + make timgen-build docker compose --compatibility -f docker-compose.deps.yml -f docker-compose.test.yml pull redis postgresql nginx-qgis docker compose --compatibility -f docker-compose.deps.yml -f docker-compose.test.yml build --parallel qgis geoserver micka diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 54d50622c..9ed48ae03 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,6 +32,7 @@ jobs: run: | cp .env.test .env make pull-dev-images + make timgen-build docker compose --compatibility -f docker-compose.deps.yml -f docker-compose.test.yml pull redis postgresql nginx-qgis docker compose --compatibility -f docker-compose.deps.yml -f docker-compose.test.yml build --parallel qgis geoserver micka diff --git a/.github/workflows/optional_tests.yml b/.github/workflows/optional_tests.yml index f5ac0435e..f25711a7c 100644 --- a/.github/workflows/optional_tests.yml +++ b/.github/workflows/optional_tests.yml @@ -29,6 +29,7 @@ jobs: run: | cp .env.test .env make pull-dev-images + make timgen-build docker compose --compatibility -f docker-compose.deps.yml -f docker-compose.test.yml pull redis postgresql nginx-qgis docker compose --compatibility -f docker-compose.deps.yml -f docker-compose.test.yml build --parallel qgis geoserver micka diff --git a/Makefile b/Makefile index 2132c980a..2221a08d4 100644 --- a/Makefile +++ b/Makefile @@ -422,8 +422,6 @@ pull-dev-images: docker pull layermanager/layman:client-latest docker tag layermanager/layman:client-latest layman_client docker tag layermanager/layman:client-latest layman_client_test - docker pull layermanager/layman:timgen-latest - docker tag layermanager/layman:timgen-latest timgen render-puml-images: docker run --rm -it -u $(UID_GID) -v $$(pwd):/src plantuml/plantuml -v /src/**/*.puml