diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad8afd9542b432d27afb3e008fb5a89ca615fd82..d8ad27961aa4ef7083a82130cf30b847b519a6ef 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 efd326e1e648f7b0ff797042e6bd86eb23d9bd0e..de75707ba25cb783b5133103ebd3c2e9d4220200 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 523f7c5f731e63540d3d1a928625600b3e56796f..7eadda7b31d8297073572b103cd5275561190eae 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 d8a32dc810d01daee8f5d19ea621f8a64d82ea73..20d9827d18699ac18a533924f5658a8046f7940b 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 3dd56385743f587274c0f5bc228ae1b4ed7b9ee7..021c4547a8ce5146b855e61a9af95dfd6f94e18f 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",