From f87a462bdc1f51d0f0facede096a1f8ad938b21b Mon Sep 17 00:00:00 2001 From: hoangvv Date: Thu, 16 Jan 2025 09:53:49 +0700 Subject: [PATCH 1/6] update workflow trigger on push branch dev --- .github/workflows/setup_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/setup_docker.yml b/.github/workflows/setup_docker.yml index af811a2dc..2401a6aec 100644 --- a/.github/workflows/setup_docker.yml +++ b/.github/workflows/setup_docker.yml @@ -2,7 +2,7 @@ name: Setup Docker Action on: push: branches: - - main + - dev jobs: setup_docker: if: contains(github.event.head_commit.message, '@docker') From 56f61e60e565282f8afe87ee3899bd8b2e22f0a5 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Thu, 16 Jan 2025 09:55:35 +0700 Subject: [PATCH 2/6] @exec @docker @native @push_image @run_test --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index e21342681..0195c4089 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ CONTAINER_ID=${PROJECT}-${TAG} VERSION := community ADDONS=${PWD}/addons,${PWD}/odoo/addons BACKUP=${CDN}/raw/branch/main/backup/${VERSION}/odoo18-main_2025-01-15_08-05-47.zip + ##### Native Deployment######### install: sudo apt update -y && \ From 1cb1ac90e9a1ee6030401b098b611b5f65d127e6 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Thu, 16 Jan 2025 09:57:26 +0700 Subject: [PATCH 3/6] update dev --- .github/workflows/setup_docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/setup_docker.yml b/.github/workflows/setup_docker.yml index 2401a6aec..778051532 100644 --- a/.github/workflows/setup_docker.yml +++ b/.github/workflows/setup_docker.yml @@ -2,6 +2,7 @@ name: Setup Docker Action on: push: branches: + - main - dev jobs: setup_docker: From 994df0b8f6200e5561915a4addd060411c1be745 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Thu, 16 Jan 2025 09:58:18 +0700 Subject: [PATCH 4/6] test workflow dev @docker @native @push_image @run_test --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 0195c4089..e21342681 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,6 @@ CONTAINER_ID=${PROJECT}-${TAG} VERSION := community ADDONS=${PWD}/addons,${PWD}/odoo/addons BACKUP=${CDN}/raw/branch/main/backup/${VERSION}/odoo18-main_2025-01-15_08-05-47.zip - ##### Native Deployment######### install: sudo apt update -y && \ From 410a4144405f5b2f81e23057c3a8b8e009ecdf32 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Thu, 16 Jan 2025 10:02:58 +0700 Subject: [PATCH 5/6] update --- .github/workflows/setup_docker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/setup_docker.yml b/.github/workflows/setup_docker.yml index 778051532..323c9d831 100644 --- a/.github/workflows/setup_docker.yml +++ b/.github/workflows/setup_docker.yml @@ -1,9 +1,10 @@ name: Setup Docker Action on: push: - branches: + branches: - main - dev + - feature/* jobs: setup_docker: if: contains(github.event.head_commit.message, '@docker') From 55b3439aa0bba99875ea56ad6bd7db585ef2b374 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Thu, 16 Jan 2025 10:06:20 +0700 Subject: [PATCH 6/6] exec @native @docker @push_image @run_test --- .github/workflows/setup_docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/setup_docker.yml b/.github/workflows/setup_docker.yml index 323c9d831..551ef4fbd 100644 --- a/.github/workflows/setup_docker.yml +++ b/.github/workflows/setup_docker.yml @@ -13,6 +13,7 @@ jobs: matrix: python: - 3.12.7 + steps: - name: Fix Permission run: |