From 07ca250f9916401cbd1d7c3e45ec8b19b7c890ca Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Sat, 11 Nov 2023 21:17:00 +0100
Subject: [PATCH] fix(#132): run tests directly using cargo
---
.gitlab-ci.yml | 14 +++++++-------
docker/Dockerfile | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e4b04ffb..be1b24d9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,20 +127,20 @@ build_release_tag:
IMAGE_TAG: "$CI_COMMIT_TAG"
PODMAN_BUILD_OPTIONS: "--platform linux/amd64"
-test_debug:
+tests:
stage: tests
- extends: .docker_build
rules:
- if: $CI_COMMIT_REF_NAME =~ /^wip*$/
when: manual
- if: $CI_COMMIT_TAG
when: never
- if: '$CI_MERGE_REQUEST_ID || $CI_COMMIT_BRANCH == "master"'
- - when: manual
- variables:
- IMAGE_NAME: "duniter/duniter-v2s-test"
- IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA"
- PODMAN_BUILD_OPTIONS: "--target build --build-arg debug=1 --build-arg cucumber=1"
+ when: manual
+ script:
+ # cargo build is required for cucumber tests anyway
+ - cargo build
+ - cargo tu
+ - cargo cucumber
test_release:
stage: tests
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 791c0b5d3..7b3e0dd7c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -49,7 +49,7 @@ RUN set -x && \
. /root/dynenv && \
cargo build --locked $CARGO_OPTIONS --target "$RUST_ARCH_TRIPLET" && \
mkdir -p build && \
- cp target/$RUST_ARCH_TRIPLET/$TARGET_FOLDER/duniter build/
+ mv target/$RUST_ARCH_TRIPLET/$TARGET_FOLDER/duniter build/
# Run tests if requested, expted when cross-building
ARG cucumber=0
--
GitLab