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

Syncing from upstream itpp-labs/sync-addons (13.0) #307

Merged
merged 4 commits into from
Feb 27, 2025
Merged

Syncing from upstream itpp-labs/sync-addons (13.0) #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b078ca
:construction_worker_man: sync DINAR
actions-user Feb 26, 2025
63f2d91
:construction_worker_man: sync DINAR
actions-user Feb 26, 2025
7a3e299
:construction_worker_man: sync DINAR
actions-user Feb 26, 2025
e40b000
:construction_worker_man: sync DINAR
actions-user Feb 26, 2025
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
30 changes: 15 additions & 15 deletions .github/workflows/DINAR-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" >>
Expand All @@ -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
Expand Down Expand Up @@ -122,15 +122,15 @@ 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
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
Expand All @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand All @@ -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
8 changes: 4 additions & 4 deletions .github/workflows/DINAR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
Loading