From 4790ba04b706b416768aefe2f717579c7ffb1a89 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 26 Feb 2025 13:10:41 +0000 Subject: [PATCH 1/4] :construction_worker_man: sync DINAR Pushed from https://github.com/itpp-labs/DINAR/.github/workflows/fork2repos.yml --- .github/workflows/DINAR-pr.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/DINAR-pr.yml b/.github/workflows/DINAR-pr.yml index afbf34de..b212f054 100644 --- a/.github/workflows/DINAR-pr.yml +++ b/.github/workflows/DINAR-pr.yml @@ -122,9 +122,9 @@ jobs: pip install plumbum PyGithub pyyaml - name: Download Docker images with preinstalled modules run: | - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start - name: Analyze PR run: | # Get list of installed modules @@ -145,8 +145,8 @@ jobs: # Install new dependencies without tests export MODULES="${{ env.PR_MODULES_DEPS }}" export LOAD_MODULES="${{ env.PR_MODULES_LOAD }}" - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit - name: Install Additional Dependencies (Packages) if: env.PR_DEPS != '' run: | @@ -187,8 +187,8 @@ jobs: export MODULES="${{ env.PR_MODULES }}" export LOAD_MODULES="${{ env.PR_MODULES_LOAD }}" export ODOO_EXTRA_ARG=--test-enable - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit tests-all: name: Integration Tests @@ -248,9 +248,9 @@ jobs: bash DINAR/workflow-files/how-to-run-locally.sh ${{ secrets.GITHUB_TOKEN }} - name: Download base images run: | - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start - name: Apply new-deps artifact if: env.ARTIFACT != 'empty' run: | @@ -260,5 +260,5 @@ jobs: export MODULES="${{ env.ALL_MODULES }}" export LOAD_MODULES="${{ env.ALL_MODULES_LOAD }}" export ODOO_EXTRA_ARG=--test-enable - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config - docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config + docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit From 8ca62a12affea621f444e79eeab117e78b6ff95d Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 26 Feb 2025 13:24:51 +0000 Subject: [PATCH 2/4] :construction_worker_man: sync DINAR Pushed from https://github.com/itpp-labs/DINAR/.github/workflows/fork2repos.yml --- .github/workflows/DINAR-pr.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/DINAR-pr.yml b/.github/workflows/DINAR-pr.yml index b212f054..f3484910 100644 --- a/.github/workflows/DINAR-pr.yml +++ b/.github/workflows/DINAR-pr.yml @@ -122,9 +122,9 @@ jobs: pip install plumbum PyGithub pyyaml - name: Download Docker images with preinstalled modules run: | - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start - name: Analyze PR run: | # Get list of installed modules @@ -145,8 +145,8 @@ jobs: # Install new dependencies without tests export MODULES="${{ env.PR_MODULES_DEPS }}" export LOAD_MODULES="${{ env.PR_MODULES_LOAD }}" - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit - name: Install Additional Dependencies (Packages) if: env.PR_DEPS != '' run: | @@ -187,8 +187,8 @@ jobs: export MODULES="${{ env.PR_MODULES }}" export LOAD_MODULES="${{ env.PR_MODULES_LOAD }}" export ODOO_EXTRA_ARG=--test-enable - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit tests-all: name: Integration Tests @@ -248,9 +248,9 @@ jobs: bash DINAR/workflow-files/how-to-run-locally.sh ${{ secrets.GITHUB_TOKEN }} - name: Download base images run: | - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start - name: Apply new-deps artifact if: env.ARTIFACT != 'empty' run: | @@ -260,5 +260,5 @@ jobs: export MODULES="${{ env.ALL_MODULES }}" export LOAD_MODULES="${{ env.ALL_MODULES_LOAD }}" export ODOO_EXTRA_ARG=--test-enable - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config - docker compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml config + docker compose -p dinar -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --abort-on-container-exit From 6e35791033d1985a6243c6e7d886cf38f755884a Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 26 Feb 2025 13:41:15 +0000 Subject: [PATCH 3/4] :construction_worker_man: sync DINAR Pushed from https://github.com/itpp-labs/DINAR/.github/workflows/fork2repos.yml --- .github/workflows/DINAR-pr.yml | 4 ++-- .github/workflows/DINAR.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/DINAR-pr.yml b/.github/workflows/DINAR-pr.yml index f3484910..a9a89ebe 100644 --- a/.github/workflows/DINAR-pr.yml +++ b/.github/workflows/DINAR-pr.yml @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v2 - uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.10" - name: Check Python Version run: echo "PY=$(python --version --version | sha256sum | cut -d' ' -f1)" >> @@ -56,7 +56,7 @@ jobs: ref: master - uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.10" - name: Install python tools run: | pip install plumbum PyGithub pyyaml diff --git a/.github/workflows/DINAR.yml b/.github/workflows/DINAR.yml index 197e46c3..81b3ddd7 100644 --- a/.github/workflows/DINAR.yml +++ b/.github/workflows/DINAR.yml @@ -57,18 +57,18 @@ jobs: - check-branch steps: - name: Checkout Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: REPO - name: Checkout DINAR - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: DINAR repository: itpp-labs/DINAR-fork ref: master - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v4 with: - python-version: "3.7.x" + python-version: "3.10" - name: Prepare build folder run: | cp -rnT DINAR/embedded-files/ REPO/ From b5bcd67fbad6a64b81d80c854121f37bee40cb0b Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 26 Feb 2025 14:34:00 +0000 Subject: [PATCH 4/4] :construction_worker_man: sync DINAR Pushed from https://github.com/itpp-labs/DINAR/.github/workflows/fork2repos.yml --- .github/workflows/DINAR-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/DINAR-pr.yml b/.github/workflows/DINAR-pr.yml index a9a89ebe..85ab0450 100644 --- a/.github/workflows/DINAR-pr.yml +++ b/.github/workflows/DINAR-pr.yml @@ -130,7 +130,7 @@ jobs: # Get list of installed modules ODOO_BASE_MODULES=$(docker inspect \ --format '{{ index .Config.Labels "dinar.odoo.modules"}}' \ - dinar_odoo_1) + dinar-odoo-1) echo "ODOO_BASE_MODULES=$ODOO_BASE_MODULES" # sets environment variables that available in next steps via $ {{ env.PR_... }} notation