From f8095763b9622b518e3a2ba7136365aa92e37f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me>
Date: Thu, 25 Jan 2024 18:17:26 +0100
Subject: [PATCH] Assignment CI/CD file => Fix the name of the dind service
---
.gitlab-ci.yml | 2 +-
CHANGELOG.md | 8 +++++++-
ExpressAPI/assets/assignment_gitlab_ci.yml | 2 +-
ExpressAPI/package-lock.json | 4 ++--
ExpressAPI/package.json | 2 +-
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad8afd9..d8ad279 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -220,7 +220,7 @@ release:gitlab:
# Extract description from CHANGELOG.md
- CHANGELOG_LINE_START=`awk '/##\ [0-9]+\.[0-9]+\.[0-9]+/{print NR; exit;}' CHANGELOG.md`
- - CHANGELOG_LINE_END=`awk '/##\ [0-9]+\.[0-9]+\.[0-9]+/{ count++; if(count>1) {print NR; exit;}}' CHANGELOG.md`
+ - CHANGELOG_LINE_END=`awk '/##\ [0-9]+\.[0-9]+\.0/{ count++; if(count>1) {print NR; exit;}}' CHANGELOG.md`
- DESCRIPTION=`awk 'NR > '$CHANGELOG_LINE_START' && NR < '$CHANGELOG_LINE_END'' CHANGELOG.md`
# Create Release (can't be done by release_step of gitlab image because it don't have access to env var defined in script_step)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index efd326e..de75707 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,13 @@
-->
-## 3.4.0 (???)
+## 3.4.1 (2023-01-25)
+
+### 🐛 Bugfix
+- Fix assignment gitlab CI/CD pipeline: fix the name of the dind service
+
+
+## 3.4.0 (2023-01-23)
### ✨ Feature
- Limit of 2 exercises by user
diff --git a/ExpressAPI/assets/assignment_gitlab_ci.yml b/ExpressAPI/assets/assignment_gitlab_ci.yml
index 523f7c5..7eadda7 100644
--- a/ExpressAPI/assets/assignment_gitlab_ci.yml
+++ b/ExpressAPI/assets/assignment_gitlab_ci.yml
@@ -18,7 +18,7 @@ dojo:
tags:
- dojo_assignment
services:
- - docker:docker:24.0.6-dind
+ - docker:24.0.6-dind
image:
name: dojohesso/dojo_assignment_checker:latest
script:
diff --git a/ExpressAPI/package-lock.json b/ExpressAPI/package-lock.json
index d8a32dc..20d9827 100644
--- a/ExpressAPI/package-lock.json
+++ b/ExpressAPI/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "dojo_backend_api",
- "version": "3.4.0",
+ "version": "3.4.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "dojo_backend_api",
- "version": "3.4.0",
+ "version": "3.4.1",
"license": "AGPLv3",
"dependencies": {
"@prisma/client": "^5.8.1",
diff --git a/ExpressAPI/package.json b/ExpressAPI/package.json
index 3dd5638..021c454 100644
--- a/ExpressAPI/package.json
+++ b/ExpressAPI/package.json
@@ -1,7 +1,7 @@
{
"name" : "dojo_backend_api",
"description" : "Backend API of the Dojo project",
- "version" : "3.4.0",
+ "version" : "3.4.1",
"license" : "AGPLv3",
"author" : "Michaël Minelli <dojo@minelli.me>",
"main" : "dist/src/app.js",
--
GitLab