Skip to content

Commit 6b72f10

Browse files
Update yml -> yaml and verify packaged contents.
1 parent f9c8f38 commit 6b72f10

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

.github/workflows/development.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ jobs:
3636
DOCKER_CLIENT_TIMEOUT: "120"
3737
COMPOSE_HTTP_TIMEOUT: "120"
3838
run: |
39-
docker-compose -f LNX-docker-compose.yml up --build --exit-code-from app
39+
docker-compose -f LNX-docker-compose.yaml up --build --exit-code-from app

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ mym/
33
*.env
44
notebook
55
*getSchema.m
6-
docker-compose.yml
6+
docker-compose.yaml
77
.vscode
88
matlab.prf
99
win.*

LNX-docker-compose.yml renamed to LNX-docker-compose.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker-compose -f LNX-docker-compose.yml --env-file LNX.env up --build --exit-code-from app
1+
# docker-compose -f LNX-docker-compose.yaml --env-file LNX.env up --build --exit-code-from app
22
version: '2.2'
33
x-net: &net
44
networks:
@@ -93,17 +93,18 @@ services:
9393
'raphael.h.guzman@gmail.com',\
9494
['Scientific workflow management framework built on top of a ' \
9595
'relational database.'],\
96-
docs,\
97-
{'.vscode', '.git', '*.env', '.gitignore', '*.yml', 'tests', 'mym'\
98-
'docs-parts', '*.txt', '*.prf', '*.md'},\
99-
@() strjoin(arrayfun(@(x) num2str(x),\
100-
cell2mat(struct2cell(dj.version)),\
101-
'uni', false),\
96+
docs,\
97+
{'.vscode', '.git*', '*.env', '*.yaml', 'tests', 'mym', 'docs-parts',\
98+
'*.txt', '*.prf', '*.md', 'notebook'},\
99+
@() strjoin(arrayfun(@(x) num2str(x),\
100+
cell2mat(struct2cell(dj.version)),\
101+
'uni', false),\
102102
'.'),\
103-
{'+dj', 'erd.m'});\
103+
{'+dj', 'erd.m'});\
104104
matlab.addons.toolbox.installToolbox('DataJoint.mltbx');\
105105
cd(getenv('ORIG_DIR'));\
106106
addpath('tests');\
107+
dir(fileparts(which('erd')));\
107108
res=run(Main);\
108109
disp(res);\
109110
if all([res.Passed]) exit, else exit(1), end;\

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ MATLAB_UID=1000
4747
MATLAB_GID=1000
4848
MYSQL_TAG=5.7
4949
```
50-
* `cp local-docker-compose.yml docker-compose.yml`
50+
* `cp local-docker-compose.yaml docker-compose.yaml`
5151
* `docker-compose up` (Note configured `JUPYTER_PASSWORD`)
5252
* Select a means of running MATLAB e.g. Jupyter Notebook, GUI, or Terminal (see bottom)
5353
* Add `tests` directory to path e.g. in MATLAB, `addpath('tests')`

local-docker-compose.yml renamed to local-docker-compose.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker-compose -f local-docker-compose.yml --env-file LNX.env up --build
1+
# docker-compose -f local-docker-compose.yaml --env-file LNX.env up --build
22
version: '2.4'
33
x-net: &net
44
networks:
@@ -105,8 +105,8 @@ services:
105105
['Scientific workflow management framework built on top of a ' \
106106
'relational database.'],\
107107
docs,\
108-
{'.vscode', '.git', '*.env', '.gitignore', '*.yml', 'tests', 'mym'\
109-
'docs-parts', '*.txt', '*.prf', '*.md'},\
108+
{'.vscode', '.git*', '*.env', '*.yaml', 'tests', 'mym', 'docs-parts',\
109+
'*.txt', '*.prf', '*.md', 'notebook'},\
110110
@() strjoin(arrayfun(@(x) num2str(x),\
111111
cell2mat(struct2cell(dj.version)),\
112112
'uni', false),\
@@ -116,6 +116,7 @@ services:
116116
addpath('tests');\
117117
savepath;\
118118
cd(tempdir);\
119+
dir(fileparts(which('erd')));\
119120
disp(dj.version);\
120121
"
121122
cd "$${ORIG_DIR}"

0 commit comments

Comments
 (0)