diff --git a/.gitlab-ci/backend.yml b/.gitlab-ci/backend.yml index 134b2cf87..0b8395a29 100644 --- a/.gitlab-ci/backend.yml +++ b/.gitlab-ci/backend.yml @@ -50,10 +50,11 @@ compile: needs: - job: container optional: true - image: &backend-image ${CI_REGISTRY_IMAGE}/backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} +# image: &backend-image ${CI_REGISTRY_IMAGE}/backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} script: - - &load-backend-image zcat docker/backend/image.tar.gz | podman image load - - make -- --docker-run-backend-build FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose +# - &load-backend-image zcat docker/backend/image.tar.gz | podman image load +# - make -- --docker-run-backend-build FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose + - make -- run-backend-build FRADRIVE_SERVICE=backend artifacts: paths: - /fradrive/.stack/ @@ -65,10 +66,11 @@ lint: needs: - job: container optional: true - image: *backend-image +# image: *backend-image script: - - *load-backend-image - - make -- --docker-run-backend-lint FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose +# - *load-backend-image +# - make -- --docker-run-backend-lint FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose + - make -- backend-lint FRADRIVE_SERVICE=backend cache: *backend-cache test: @@ -77,8 +79,9 @@ test: - job: container optional: true - compile - image: *backend-image +# image: *backend-image script: - - *load-backend-image - - make -- --docker-run-backend-test FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose +# - *load-backend-image +# - make -- --docker-run-backend-test FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose + - make -- backend-test FRADRIVE_SERVICE=backend cache: *backend-cache