Skip to content

Commit 1fdc8d7

Browse files
committed
Merge remote-tracking branch 'origin/12.0' into 12.0-store
2 parents 4fad6f9 + d5bcad5 commit 1fdc8d7

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/workflows/DINAR-pr.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ jobs:
122122
pip install plumbum PyGithub pyyaml
123123
- name: Download Docker images with preinstalled modules
124124
run: |
125-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config
126-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull
127-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start
125+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config
126+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull
127+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start
128128
- name: Analyze PR
129129
run: |
130130
# Get list of installed modules
@@ -145,8 +145,8 @@ jobs:
145145
# Install new dependencies without tests
146146
export MODULES="${{ env.PR_MODULES_DEPS }}"
147147
export LOAD_MODULES="${{ env.PR_MODULES_LOAD }}"
148-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config
149-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit
148+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config
149+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit
150150
- name: Install Additional Dependencies (Packages)
151151
if: env.PR_DEPS != ''
152152
run: |
@@ -187,8 +187,8 @@ jobs:
187187
export MODULES="${{ env.PR_MODULES }}"
188188
export LOAD_MODULES="${{ env.PR_MODULES_LOAD }}"
189189
export ODOO_EXTRA_ARG=--test-enable
190-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config
191-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit
190+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config
191+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit
192192
193193
tests-all:
194194
name: Integration Tests
@@ -248,9 +248,9 @@ jobs:
248248
bash DINAR/workflow-files/how-to-run-locally.sh ${{ secrets.GITHUB_TOKEN }}
249249
- name: Download base images
250250
run: |
251-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config
252-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull
253-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start
251+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config
252+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull
253+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start
254254
- name: Apply new-deps artifact
255255
if: env.ARTIFACT != 'empty'
256256
run: |
@@ -260,5 +260,5 @@ jobs:
260260
export MODULES="${{ env.ALL_MODULES }}"
261261
export LOAD_MODULES="${{ env.ALL_MODULES_LOAD }}"
262262
export ODOO_EXTRA_ARG=--test-enable
263-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config
264-
docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit
263+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config
264+
docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit

0 commit comments

Comments
 (0)