From e643b9d8975918f84450fd59f539a8bc85b997e0 Mon Sep 17 00:00:00 2001 From: Mohamed Fatih Date: Sun, 6 Mar 2022 16:21:54 +0100 Subject: [PATCH 1/2] correction --- game_solve.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/game_solve.c b/game_solve.c index 4ed7ea5..fddcdf0 100644 --- a/game_solve.c +++ b/game_solve.c @@ -8,12 +8,11 @@ #include "game_tools.h" void usage() { - fprintf(stderr, "problem with paramametre"); + fprintf(stderr, "problem with paramametre\n"); exit(EXIT_FAILURE); } int main(int argc, char* argv[]) { - // check if nb of param is correct if (argc != 3 && argc != 4) { // nb param is not correct @@ -39,7 +38,7 @@ int main(int argc, char* argv[]) { game_save(g1, filename); } } - // if the option is -s + // if the option is -c else if (strcmp(option, "-c") == 0) { // GET THE NB OF SOLUTIONS cgame g2 = game_load(file); @@ -59,6 +58,5 @@ int main(int argc, char* argv[]) { printf("or '-c' if you want the number of solutions\n"); exit(EXIT_FAILURE); }*/ - return EXIT_SUCCESS; } \ No newline at end of file From 3d96c72255e91267ba10b75ea4c2b990d257dc37 Mon Sep 17 00:00:00 2001 From: Theophyl Hoguet Date: Sun, 6 Mar 2022 16:32:38 +0100 Subject: [PATCH 2/2] Update .gitlab-ci.yml file only on main and merge requests + ignore if draft on commit message --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 251f0e4..c109cd8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,13 @@ default: - shell - CREMI +workflow: + rules: + - if: $CI_COMMIT_MESSAGE =~ /-draft$/ + when: never + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + build-job: # This job runs in the build stage, which runs first. allow_failure: false stage: build