Merge pull request #46 from LedgerHQ/cev/Fix-publish-workflow

Fix publish workflow
LedgerHQ · May 31, 2024 · ce765d0 · ce765d0
2 parents 2fb028c + 33f0e4d
commit ce765d0
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -70,4 +70,4 @@ jobs:
     - name: Publish to Visual Studio Marketplace
       run: npm run deploy
       env:
-        pat: ${{ secrets.VSCE_PAT }}
+        VSCE_PAT: ${{ secrets.VSCE_PAT }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.7.1]
+
+### Fixed
+
+* Fix regression on AppName detection on Windows platform
+* Fix Env variable in Deploy workflow
+
 ## [0.7.0]
 
 ### Changed

diff --git a/README.md b/README.md
@@ -72,6 +72,11 @@ This extension contributes the following settings:
 
 ## Release Notes
 
+## 0.7.1
+
+* Fix regression on AppName detection on Windows platform
+* Fix Env variable in Deploy workflow
+
 ## 0.7.0
 
 * Update `webpack` and `electron` versions and dependencies

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "ledger-dev-tools",
   "displayName": "Ledger Dev Tools",
   "description": "Tools to accelerate development of apps for Ledger devices.",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "publisher": "LedgerHQ",
   "license": "Apache",
   "icon": "resources/ledger-square.png",
@@ -251,7 +251,7 @@
     "ts-loader": "^9.4.3",
     "typescript": "^5.1.3",
     "webpack": "^5.91.0",
-    "webpack-cli": "^5.1.1",
+    "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.4"
   }
 }
diff --git a/src/appSelector.ts b/src/appSelector.ts
@@ -214,7 +214,7 @@ export function findAppInFolder(folderUri: vscode.Uri): App | undefined {
         let tomlContent = toml.parse(fileContent);
         [appLanguage, buildDirPath, compatibleDevices, testsDir, testsUseCases, buildUseCases] = parseManifest(tomlContent);
         if (appLanguage === "C") {
-          appName = getAppName(folderStr.replace(/^file?:\/\//, ''));
+          appName = getAppName(folderUri.fsPath);
         } else {
           let hostBuildDirPath = buildDirPath.startsWith("./") ? path.join(appFolderUri.fsPath, buildDirPath) : buildDirPath;
           [appName, packageName] = parseCargoToml(path.join(hostBuildDirPath, "Cargo.toml"));
@@ -232,7 +232,7 @@ export function findAppInFolder(folderUri: vscode.Uri): App | undefined {
         break;
       }
       case "makefile": {
-        appName = getAppName(folderStr.replace(/^file?:\/\//, ''));
+        appName = getAppName(folderUri.fsPath);
         testsDir = findFunctionalTestsWithoutManifest(appFolderUri);
         showManifestWarning(appFolderName, false);
         break;
@@ -255,7 +255,7 @@ export function findAppInFolder(folderUri: vscode.Uri): App | undefined {
   // Add the app to the list
   if (found) {
     if (appLanguage === "C") {
-      variants = getAppVariants(folderStr.replace(/^file?:\/\//, ''), appName, appFolderUri);
+      variants = getAppVariants(folderUri.fsPath, appName, appFolderUri);
       if (variants.values.length > 1) {
         vscode.commands.executeCommand("setContext", "ledgerDevTools.showSelectVariant", true);
       } else {