From 2afd4813df17b556062891552be1bc258d716b73 Mon Sep 17 00:00:00 2001
From: Mohamed AZIKIOU <mazikiou@takima.fr>
Date: Wed, 3 Aug 2022 09:50:10 +0000
Subject: [PATCH] fix: sync_deadlock_version_with_devcontainer
---
deadlock-plugins/deadlock-extension/CHANGELOG.md | 6 +++++-
deadlock-plugins/deadlock-extension/package-lock.json | 4 ++--
deadlock-plugins/deadlock-extension/package.json | 2 +-
.../src/core/mission/missionDevContainer.ts | 3 ++-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/deadlock-plugins/deadlock-extension/CHANGELOG.md b/deadlock-plugins/deadlock-extension/CHANGELOG.md
index 19d3b66a..75c1079d 100644
--- a/deadlock-plugins/deadlock-extension/CHANGELOG.md
+++ b/deadlock-plugins/deadlock-extension/CHANGELOG.md
@@ -4,12 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
-#### [0.1.13](https://gitlab.takima.io/deadlock-public/deadlock-desktop/compare/0.1.12...0.1.13)
+#### [v0.1.14](https://gitlab.takima.io/deadlock-public/deadlock-desktop/compare/v1.0.1...v0.1.14)
- feat: integrated authentication view in Deadlock panel [`feedc85`](https://gitlab.takima.io/deadlock-public/deadlock-desktop/commit/feedc85fd1cc1ed13f3129f3afbcf700f46a291d)
- feat: submit code to api [`bf2644d`](https://gitlab.takima.io/deadlock-public/deadlock-desktop/commit/bf2644d18ef0cb05acd3882c0a7e851bc3f6872d)
- feat: make initial commit after structure init [`94968e6`](https://gitlab.takima.io/deadlock-public/deadlock-desktop/commit/94968e6f1483059dbb45946821d7342cf33d0405)
+### [v1.0.1](https://gitlab.takima.io/deadlock-public/deadlock-desktop/compare/0.1.12...v1.0.1)
+
+> 7 July 2022
+
#### [0.1.12](https://gitlab.takima.io/deadlock-public/deadlock-desktop/compare/0.1.11...0.1.12)
> 7 July 2022
diff --git a/deadlock-plugins/deadlock-extension/package-lock.json b/deadlock-plugins/deadlock-extension/package-lock.json
index c4bee32c..becf139b 100644
--- a/deadlock-plugins/deadlock-extension/package-lock.json
+++ b/deadlock-plugins/deadlock-extension/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "deadlock-coding",
- "version": "0.1.13",
+ "version": "0.1.14",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "deadlock-coding",
- "version": "0.1.13",
+ "version": "0.1.14",
"dependencies": {
"@types/tar": "^6.1.1",
"@vscode/webview-ui-toolkit": "^1.0.0",
diff --git a/deadlock-plugins/deadlock-extension/package.json b/deadlock-plugins/deadlock-extension/package.json
index b5204d7d..6224dabe 100644
--- a/deadlock-plugins/deadlock-extension/package.json
+++ b/deadlock-plugins/deadlock-extension/package.json
@@ -1,7 +1,7 @@
{
"name": "deadlock-coding",
"description": "Deadlock Coding",
- "version": "0.1.13",
+ "version": "0.1.14",
"publisher": "Deadlock",
"icon": "media/logo.png",
"engines": {
diff --git a/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts b/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts
index 951eb6a5..e47003ce 100644
--- a/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts
@@ -11,6 +11,7 @@ import { getReviewedStudentWorkdirPath } from '../utils/mission.util';
import { homedir } from 'os';
import { extensionError } from '../../recorder/utils/log';
import { createDirectories } from '../../recorder/utils/workdir';
+import Controller from '../controller';
const remoteUserHomeDir = '/home/deadlock';
const remoteMissionDir = `${remoteUserHomeDir}/mission/`;
@@ -57,7 +58,7 @@ export class MissionDevContainer {
if (process.env.DL_MOUNT_EXTENSION === 'true') {
this.extensionPath = '/injected-extension/extension.vsix';
} else {
- this.extensionPath = 'Deadlock.deadlock-coding';
+ this.extensionPath = `Deadlock.deadlock-coding@${Controller.instance.context.extension.packageJSON.version}`;
}
}
--
GitLab