From c972c5d3944657b4af0b0438656a619ba26c218b Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Fri, 3 Mar 2023 14:44:09 +0100 Subject: [PATCH] FIX #24068 TIME 0:10 add cmd ci reset approvals in gitlab_ci --- .gitlab-ci.yml | 4 ++-- ci/reset_approvals.sh | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 ci/reset_approvals.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3e5f27243..3b76e5f7df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,5 +164,5 @@ reset_approvals: - apt-get update -yqq > /dev/null - apt install -y curl script: - - chmod +x ./ci/reset_approvals.sh - - ./ci/reset_approvals.sh \ No newline at end of file + - MR_ID=`echo $CI_OPEN_MERGE_REQUESTS | grep -oP "!(.)*" | tr -d "!"` + - curl --header "PRIVATE-TOKEN: $TOKEN_GITLAB" "https://labs.maarch.org/api/v4/projects/$CI_PROJECT_ID/merge_requests/$MR_ID/reset_approvals" diff --git a/ci/reset_approvals.sh b/ci/reset_approvals.sh deleted file mode 100644 index c78dbae5b0..0000000000 --- a/ci/reset_approvals.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -MR_ID=`echo $CI_OPEN_MERGE_REQUESTS | grep -oP "!(.)*" | tr -d "!"` -curl --header "PRIVATE-TOKEN: $TOKEN_GITLAB" "https://labs.maarch.org/api/v4/projects/$CI_PROJECT_ID/merge_requests/$MR_ID/reset_approvals" -- GitLab