Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"recommendations": [
"intersystems.language-server",
"intersystems-community.testingmanager",
"intersystems-community.vscode-objectscript",
"ms-azuretools.vscode-docker"
]
}
"recommendations": [
"intersystems.language-server",
"intersystems-community.testingmanager",
"intersystems-community.vscode-objectscript",
"ms-azuretools.vscode-containers"
]
}
52 changes: 30 additions & 22 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
{
"objectscript.conn": {
"active": true,
"port": 52774,
"host": "localhost",
"username": "_system",
"password": "SYS",
"ns": "USER"
"objectscript.conn": {
"active": true,
"docker-compose": {
"service": "iris"
},
// Force formatting rules
"intersystems.testingManager.client.relativeTestRoot": "tests/unit_tests",
"objectscript.multilineMethodArgs": true,
"intersystems.language-server.formatting.expandClassNames": false,
"intersystems.language-server.formatting.commands.case": "lower",
"intersystems.language-server.formatting.commands.length": "long",
"intersystems.language-server.formatting.system.case": "lower",
"intersystems.language-server.formatting.system.length": "long",
// Force tab size and indent using spaces
"editor.tabSize": 4,
"editor.detectIndentation": false,
"editor.insertSpaces": true,
"editor.formatOnSave": true,
"files.trimTrailingWhitespace": true
}
"username": "_system",
"password": "SYS",
"ns": "USER"
},
// Non-default export settings needed so Testing Manager extension can find sources when doing coverage runs
"objectscript.export": {
"addCategory": true,
"map": {
"%(.*)": "$1"
}
},
// Force formatting rules
"intersystems.testingManager.client.relativeTestRoot": "tests/unit_tests",
"objectscript.multilineMethodArgs": true,
"intersystems.language-server.formatting.expandClassNames": false,
"intersystems.language-server.formatting.commands.case": "lower",
"intersystems.language-server.formatting.commands.length": "long",
"intersystems.language-server.formatting.system.case": "lower",
"intersystems.language-server.formatting.system.length": "long",
// Force tab size and indent using spaces
"editor.tabSize": 4,
"editor.detectIndentation": false,
"editor.insertSpaces": true,
"editor.formatOnSave": true,
"files.trimTrailingWhitespace": true
}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE=irepo.intersystems.com/intersystems/iris-community:2025.1
ARG BASE=containers.intersystems.com/intersystems/iris-community:2025.1

FROM ${BASE}

Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
- TEST_REGISTRY=http://registry:52773/registry/
- TEST_REGISTRY_USER=admin
- TEST_REGISTRY_PASSWORD=SYS
ports:
ports:
- 52774:52773
volumes:
- ~/iris.key:/usr/irissys/mgr/iris.key
Expand All @@ -17,7 +17,7 @@ services:
registry:
image: intersystemsdc/iris-community:preview
restart: always
ports:
ports:
- 52775:52773
environment:
- IRISPASSWORD=SYS
Expand All @@ -28,7 +28,7 @@ services:
sandbox:
build: ./tests/sandbox/
restart: always
ports:
ports:
- 52776:52773
environment:
- IRISPASSWORD=SYS
Expand All @@ -38,10 +38,10 @@ services:
- ./:/home/irisowner/zpm/
- ./tests/sandbox/:/home/irisowner/sandbox/
command:
- -a
- -a
- iris session iris -U%SYS '##class(Security.Users).UnExpireUserPasswords("*")'
oras:
image: ghcr.io/project-zot/zot-linux-arm64:latest
image: ghcr.io/project-zot/zot-linux-amd64:latest
restart: always
ports:
- 5001:5000
6 changes: 3 additions & 3 deletions iris.script
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
do ##class(IPM.Installer).setup("/home/irisowner/zpm/",3)
zpm "repo -r -name registry -url https://pm.community.intersystems.com/"
do $System.SQL.PurgeAllNamespaces()
halt

// Currently broken for %IPM due to differing default behavior for packages starting with % - vscode-per-namespace-settings passes through as-is, IPM expects to strip %.
do ##class(%IPM.Main).Shell("install vscode-per-namespace-settings")
set ^UnitTestRoot="/usr/irissys/.vscode/%SYS/UnitTestRoot"
do ##class(%IPM.Main).Shell("install TestCoverage")
set ^UnitTestRoot="/usr/irissys/.vscode/USER/UnitTestRoot"
halt
12 changes: 6 additions & 6 deletions tests/sandbox/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ARG BASE=irepo.intersystems.com/intersystems/iris-community:2025.1
ARG BASE=containers.intersystems.com/intersystems/iris-community:2025.1
FROM ${BASE}
ARG IPM_VERSION=zpm-0.7.2.xml

USER root

RUN apt-get update \
&& apt-get install -y jq \
&& apt-get install -y git
&& apt-get install -y jq \
&& apt-get install -y git

USER irisowner

RUN --mount=type=bind,src=.,dst=/home/irisowner/sandbox/ \
iris start iris && \
sh /home/irisowner/sandbox/install-artifact.sh $IPM_VERSION \
iris stop iris quietly
iris start iris && \
sh /home/irisowner/sandbox/install-artifact.sh $IPM_VERSION \
iris stop iris quietly
1 change: 1 addition & 0 deletions tests/unit_tests/Test/coverage.list
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
%IPM.PKG