Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issues #247 & #249 #251

Merged
merged 5 commits into from
Jun 20, 2024
Merged

Fix issues #247 & #249 #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e2b0e0
test CI
Jun 19, 2024
4bfd0ea
remove duplicated keys
Jun 19, 2024
bf4d9f4
add help target year 2025
Jun 19, 2024
9b8d570
upload file updated on the CI side
Sen-real Jun 19, 2024
8279288
remove needless code
Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will be reverted later.


# Keep this in case we switch to Linux OS someday
# - name: Run tests on Linux OS
# run: xvfb-run -a npm test
Expand Down
6 changes: 0 additions & 6 deletions extension/data/alllispkeys.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ command
cond
defun
foreach
vlax-for
if
lambda
or
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
11 changes: 4 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -236,9 +236,10 @@
"2021",
"2022",
"2023",
"2024"
"2024",
"2025"
],
"default": "2024",
"default": "2025",
"description": "%autolispext.configuration.helptargetyear%"
}
}
Expand Down Expand Up @@ -666,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"
}
}
Loading