From 9e2b0e0b109d2f1bb512554f604bf4c0df7e7ded Mon Sep 17 00:00:00 2001 From: Sen Lin Application Admin Date: Tue, 18 Jun 2024 20:37:31 -0700 Subject: [PATCH 1/5] test CI --- pack.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pack.py b/pack.py index e4b85169..8bde9145 100644 --- a/pack.py +++ b/pack.py @@ -12,9 +12,9 @@ def init(): print("===============================================") print(" try to install gulp-cli") - os.system("npm install gulp-cli") # nosec + os.system("npm install gulp-cli --legacy-peer-deps") # nosec - os.system("npm install --unsafe-perm") # nosec + os.system("npm install --unsafe-perm --legacy-peer-deps") # nosec print("===============================================") print(" complete npm install") From 4bfd0ea6d9dfe7e25bb7a5927af9ccd7464162cd Mon Sep 17 00:00:00 2001 From: Sen Lin Application Admin Date: Tue, 18 Jun 2024 20:56:43 -0700 Subject: [PATCH 2/5] remove duplicated keys --- extension/data/alllispkeys.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/extension/data/alllispkeys.txt b/extension/data/alllispkeys.txt index 41afe250..5a12bce7 100644 --- a/extension/data/alllispkeys.txt +++ b/extension/data/alllispkeys.txt @@ -17,7 +17,6 @@ command cond defun foreach -vlax-for if lambda or @@ -276,9 +275,6 @@ pi :constants-prefix :prog-id :tlb-filename -:vlax-true -:vlax-false -:vlax-null acrx_cmd_modal acrx_cmd_transparent acrx_cmd_usepickset @@ -358,8 +354,6 @@ vl-catch-all-apply vl-catch-all-error-p vl-catch-all-error-message _vl-balance-parenthesis -vlax-add-cmd -vlax-remove-cmd vla-activate vla-add vla-add3dface From bf4d9f4d5d2f331e930ba9cd57d76cc6f3058d21 Mon Sep 17 00:00:00 2001 From: Sen Lin Application Admin Date: Tue, 18 Jun 2024 20:58:13 -0700 Subject: [PATCH 3/5] add help target year 2025 --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d0952a70..69b54a6e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "autolispext", "displayName": "AutoCAD AutoLISP Extension", "description": "This is a vscode extension for AutoCAD AutoLISP", - "version": "1.6.2", + "version": "1.6.3", "license": "SEE LICENSE IN LICENSE.md", "bugs": { "url": "https://github.com/Autodesk-AutoCAD/AutoLispExt/issues" @@ -236,9 +236,10 @@ "2021", "2022", "2023", - "2024" + "2024", + "2025" ], - "default": "2024", + "default": "2025", "description": "%autolispext.configuration.helptargetyear%" } } From 9b8d5704ec191acb34d0beb9a9b0a3034b516ef5 Mon Sep 17 00:00:00 2001 From: linse Date: Wed, 19 Jun 2024 17:57:11 +0800 Subject: [PATCH 4/5] upload file updated on the CI side --- .github/workflows/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 806b3069..24fd657e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,13 @@ jobs: - name: Build run: | python pack.py - + + - name: Upload package-lock.json + uses: actions/upload-artifact@v2 + with: + name: localFile + path: package-lock.json + # Keep this in case we switch to Linux OS someday # - name: Run tests on Linux OS # run: xvfb-run -a npm test From 8279288751b7c6226821998100cf376ce1898b25 Mon Sep 17 00:00:00 2001 From: Sen Lin Application Admin Date: Wed, 19 Jun 2024 03:54:39 -0700 Subject: [PATCH 5/5] remove needless code --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index 69b54a6e..fe86e142 100644 --- a/package.json +++ b/package.json @@ -667,9 +667,5 @@ "vscode-languageclient": "4.2.0", "vscode-nls": "3.2.5", "vscode-ripgrep": "1.5.8" - }, - "resolutions": { - "yargs-parser": "^18.1.3", - "glob-parent": "^6.0.1" } }