From 81a94370790fba0f002c4e98e2e058e8f7c39f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Mon, 24 Jun 2024 19:46:31 +0300 Subject: [PATCH 02/10] Update github action file --- .github/workflows/helpdesk-project.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/helpdesk-project.yml b/.github/workflows/helpdesk-project.yml index 2d2bbc507..745264978 100644 --- a/.github/workflows/helpdesk-project.yml +++ b/.github/workflows/helpdesk-project.yml @@ -56,7 +56,7 @@ jobs: echo "** [INFO] Running on branch --> ${{ github.ref }}" sudo chmod +x ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/} + sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} deploy_preprod_server: name: Deploy to Preprod @@ -68,7 +68,7 @@ jobs: echo "** [INFO] Running on branch --> ${{ github.ref }}" sudo chmod +x ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/} + sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} deploy_test_server: name: Deploy to Test @@ -79,4 +79,4 @@ jobs: run: | echo "** [INFO] Running on branch --> ${{ github.ref }}" sudo chmod +x ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/} + sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} From 705de331cbdb75dbf3856ed9965db9c17750dba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Mon, 24 Jun 2024 19:59:53 +0300 Subject: [PATCH 03/10] Update github action file --- .github/workflows/helpdesk-project.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/helpdesk-project.yml b/.github/workflows/helpdesk-project.yml index 745264978..45c48462f 100644 --- a/.github/workflows/helpdesk-project.yml +++ b/.github/workflows/helpdesk-project.yml @@ -56,7 +56,7 @@ jobs: echo "** [INFO] Running on branch --> ${{ github.ref }}" sudo chmod +x ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} + sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} deploy_preprod_server: name: Deploy to Preprod @@ -68,7 +68,7 @@ jobs: echo "** [INFO] Running on branch --> ${{ github.ref }}" sudo chmod +x ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} + sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/} deploy_test_server: name: Deploy to Test @@ -79,4 +79,4 @@ jobs: run: | echo "** [INFO] Running on branch --> ${{ github.ref }}" sudo chmod +x ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} + sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/} From a5bc56d10764b947af726b1bacf0b6a138e71782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Mon, 24 Jun 2024 21:05:53 +0300 Subject: [PATCH 04/10] Update github action file --- .github/workflows/ensan-project.yml | 63 +++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ensan-project.yml b/.github/workflows/ensan-project.yml index db2b23a7e..3bdfac6d6 100644 --- a/.github/workflows/ensan-project.yml +++ b/.github/workflows/ensan-project.yml @@ -3,8 +3,45 @@ name: Ensan Project - Pull Code on: push: branches: - - test - - preprod + - dev_odex-event + - dev_odex25_accounting + - dev_odex25_base + - dev_odex25_dms + - dev_odex25_fleet + - dev_odex25_ENSAN + - dev_odex25_hr + - dev_odex25_inventory + - dev_odex25_maintenance + - dev_odex25_mobile + - dev_odex25_pos + - dev_odex25_project + - dev_odex25_purchase + - dev_odex25_realstate + - dev_odex25_sales + - dev_odex25_survey + - dev_odex25_transactions + - dev_odex25_website + - dev_openeducat_erp-14.0.1.0 + - preprod_odex-event + - preprod_odex25_accounting + - preprod_odex25_base + - preprod_odex25_dms + - preprod_odex25_fleet + - preprod_odex25_ENSAN + - preprod_odex25_hr + - preprod_odex25_inventory + - preprod_odex25_maintenance + - preprod_odex25_mobile + - preprod_odex25_pos + - preprod_odex25_project + - preprod_odex25_purchase + - preprod_odex25_realstate + - preprod_odex25_sales + - preprod_odex25_survey + - preprod_odex25_transactions + - preprod_odex25_website + - preprod_openeducat_erp-14.0.1.0 + workflow_dispatch: @@ -12,34 +49,34 @@ jobs: deploy_master_server: name: Deploy to Master runs-on: ensan-client-project-runner - if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' + if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0') steps: - name: Checkout And Restart Project run: | echo "** [INFO] Running on branch --> ${{ github.ref }}" - sudo chmod +x ${{ secrets.ENSAN_PROJECT_PATH }}/master/standard/scripts/pull_code.sh - sudo ${{ secrets.ENSAN_PROJECT_PATH }}/master/standard/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_PROJECT_PATH }} standard ${{ secrets.ENSAN_MASTER_SERVICE }} master + sudo chmod +x ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_PROJECT_PATH }} ${{ secrets.ENSAN_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} deploy_preprod_server: name: Deploy to Preprod - runs-on: app-server-runner - if: github.ref == 'refs/heads/preprod' + runs-on: ensan-client-project-runner + if: github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' steps: - name: Checkout And Restart Project run: | echo "** [INFO] Running on branch --> ${{ github.ref }}" - sudo chmod +x ${{ secrets.ENSAN_APP_PROJECT_PATH }}/preprod/standard/scripts/pull_code.sh - sudo ${{ secrets.ENSAN_APP_PROJECT_PATH }}/preprod/standard/scripts/pull_code.sh ${{ secrets.ENSAN_APP_PROJECT_USER }} ${{ secrets.ENSAN_APP_PROJECT_PATH }} standard ${{ secrets.ENSAN_PREPROD_SERVICE }} preprod + sudo chmod +x ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_PROJECT_PATH }} ${{ secrets.ENSAN_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/} deploy_test_server: name: Deploy to Test - runs-on: app-server-runner - if: github.ref == 'refs/heads/test' + runs-on: ensan-client-project-runner + if: github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' steps: - name: Checkout And Restart Project run: | echo "** [INFO] Running on branch --> ${{ github.ref }}" - sudo chmod +x ${{ secrets.ENSAN_APP_PROJECT_PATH }}/test/standard/scripts/pull_code.sh - sudo ${{ secrets.ENSAN_APP_PROJECT_PATH }}/test/standard/scripts/pull_code.sh ${{ secrets.ENSAN_APP_PROJECT_USER }} ${{ secrets.ENSAN_APP_PROJECT_PATH }} standard ${{ secrets.ENSAN_TEST_SERVICE }} test + sudo chmod +x ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_PROJECT_PATH }} ${{ secrets.ENSAN_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/} From 16f5aaf6fbce99de5abc9b3b0f5388e2ec1134f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Mon, 24 Jun 2024 21:14:16 +0300 Subject: [PATCH 05/10] Update github action file --- .github/workflows/ensan-project.yml | 82 ----------------------------- 1 file changed, 82 deletions(-) delete mode 100644 .github/workflows/ensan-project.yml diff --git a/.github/workflows/ensan-project.yml b/.github/workflows/ensan-project.yml deleted file mode 100644 index 3bdfac6d6..000000000 --- a/.github/workflows/ensan-project.yml +++ /dev/null @@ -1,82 +0,0 @@ -name: Ensan Project - Pull Code - -on: - push: - branches: - - dev_odex-event - - dev_odex25_accounting - - dev_odex25_base - - dev_odex25_dms - - dev_odex25_fleet - - dev_odex25_ENSAN - - dev_odex25_hr - - dev_odex25_inventory - - dev_odex25_maintenance - - dev_odex25_mobile - - dev_odex25_pos - - dev_odex25_project - - dev_odex25_purchase - - dev_odex25_realstate - - dev_odex25_sales - - dev_odex25_survey - - dev_odex25_transactions - - dev_odex25_website - - dev_openeducat_erp-14.0.1.0 - - preprod_odex-event - - preprod_odex25_accounting - - preprod_odex25_base - - preprod_odex25_dms - - preprod_odex25_fleet - - preprod_odex25_ENSAN - - preprod_odex25_hr - - preprod_odex25_inventory - - preprod_odex25_maintenance - - preprod_odex25_mobile - - preprod_odex25_pos - - preprod_odex25_project - - preprod_odex25_purchase - - preprod_odex25_realstate - - preprod_odex25_sales - - preprod_odex25_survey - - preprod_odex25_transactions - - preprod_odex25_website - - preprod_openeducat_erp-14.0.1.0 - - workflow_dispatch: - - -jobs: - deploy_master_server: - name: Deploy to Master - runs-on: ensan-client-project-runner - if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0') - steps: - - name: Checkout And Restart Project - run: | - echo "** [INFO] Running on branch --> ${{ github.ref }}" - - sudo chmod +x ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_PROJECT_PATH }} ${{ secrets.ENSAN_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} - - deploy_preprod_server: - name: Deploy to Preprod - runs-on: ensan-client-project-runner - if: github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' - steps: - - name: Checkout And Restart Project - run: | - echo "** [INFO] Running on branch --> ${{ github.ref }}" - - sudo chmod +x ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_PROJECT_PATH }} ${{ secrets.ENSAN_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/} - - deploy_test_server: - name: Deploy to Test - runs-on: ensan-client-project-runner - if: github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' - steps: - - name: Checkout And Restart Project - run: | - echo "** [INFO] Running on branch --> ${{ github.ref }}" - sudo chmod +x ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_PROJECT_PATH }} ${{ secrets.ENSAN_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/} From 92e960c1931d0763c6a910c1c6aa9acafa99cee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Tue, 25 Jun 2024 06:54:11 +0300 Subject: [PATCH 06/10] Update github action file --- .github/workflows/ensan-project.yml | 82 +++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 .github/workflows/ensan-project.yml diff --git a/.github/workflows/ensan-project.yml b/.github/workflows/ensan-project.yml new file mode 100644 index 000000000..2729f6041 --- /dev/null +++ b/.github/workflows/ensan-project.yml @@ -0,0 +1,82 @@ +name: Ensan Project - Pull Code + +on: + push: + branches: + - dev_odex-event + - dev_odex25_accounting + - dev_odex25_base + - dev_odex25_dms + - dev_odex25_fleet + - dev_odex25_ENSAN + - dev_odex25_hr + - dev_odex25_inventory + - dev_odex25_maintenance + - dev_odex25_mobile + - dev_odex25_pos + - dev_odex25_project + - dev_odex25_purchase + - dev_odex25_realstate + - dev_odex25_sales + - dev_odex25_survey + - dev_odex25_transactions + - dev_odex25_website + - dev_openeducat_erp-14.0.1.0 + - preprod_odex-event + - preprod_odex25_accounting + - preprod_odex25_base + - preprod_odex25_dms + - preprod_odex25_fleet + - preprod_odex25_ENSAN + - preprod_odex25_hr + - preprod_odex25_inventory + - preprod_odex25_maintenance + - preprod_odex25_mobile + - preprod_odex25_pos + - preprod_odex25_project + - preprod_odex25_purchase + - preprod_odex25_realstate + - preprod_odex25_sales + - preprod_odex25_survey + - preprod_odex25_transactions + - preprod_odex25_website + - preprod_openeducat_erp-14.0.1.0 + + workflow_dispatch: + + +jobs: + deploy_master_server: + name: Deploy to Master + runs-on: ensan-client-project-runner + if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0') + steps: + - name: Checkout And Restart Project + run: | + echo "** [INFO] Running on branch --> ${{ github.ref }}" + + sudo chmod +x ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_PROJECT_PATH }} ${{ secrets.ENSAN_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} + + deploy_preprod_server: + name: Deploy to Preprod + runs-on: ensan-app-project-runner + if: github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' + steps: + - name: Checkout And Restart Project + run: | + echo "** [INFO] Running on branch --> ${{ github.ref }}" + + sudo chmod +x ${{ secrets.ENSAN_APP_PROJECT_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.ENSAN_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_APP_PROJECT_USER }} ${{ secrets.ENSAN_APP_PROJECT_PATH }} ${{ secrets.ENSAN_APP_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/} + + deploy_test_server: + name: Deploy to Test + runs-on: ensan-app-project-runner + if: github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' + steps: + - name: Checkout And Restart Project + run: | + echo "** [INFO] Running on branch --> ${{ github.ref }}" + sudo chmod +x ${{ secrets.ENSAN_APP_PROJECT_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.ENSAN_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_APP_PROJECT_USER }} ${{ secrets.ENSAN_APP_PROJECT_PATH }} ${{ secrets.ENSAN_APP_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/} From b743e6565f83c7d684438d9370e5c11b3f38402d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Tue, 25 Jun 2024 07:12:01 +0300 Subject: [PATCH 07/10] Update github action file --- .github/workflows/helpdesk-project.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/helpdesk-project.yml b/.github/workflows/helpdesk-project.yml index 45c48462f..022ee7fa0 100644 --- a/.github/workflows/helpdesk-project.yml +++ b/.github/workflows/helpdesk-project.yml @@ -44,7 +44,6 @@ on: workflow_dispatch: - jobs: deploy_master_server: name: Deploy to Master From 106e71cc2aa44506d837bb60f2b5aadf385f5d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Tue, 25 Jun 2024 07:12:21 +0300 Subject: [PATCH 08/10] Update github action file --- .github/workflows/ensan-project.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ensan-project.yml b/.github/workflows/ensan-project.yml index 2729f6041..0993711d0 100644 --- a/.github/workflows/ensan-project.yml +++ b/.github/workflows/ensan-project.yml @@ -44,7 +44,6 @@ on: workflow_dispatch: - jobs: deploy_master_server: name: Deploy to Master From 01ed5f9e39bfc919fca8df47ad14a29a70522636 Mon Sep 17 00:00:00 2001 From: zainab2097 <149927291+zainab2097@users.noreply.github.com> Date: Wed, 26 Jun 2024 09:23:02 +0300 Subject: [PATCH 09/10] Update petty_cash_views.xml --- .../hr_expense_petty_cash/views/petty_cash_views.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/odex25_accounting/hr_expense_petty_cash/views/petty_cash_views.xml b/odex25_accounting/hr_expense_petty_cash/views/petty_cash_views.xml index 1c4e945e3..0b171494a 100644 --- a/odex25_accounting/hr_expense_petty_cash/views/petty_cash_views.xml +++ b/odex25_accounting/hr_expense_petty_cash/views/petty_cash_views.xml @@ -212,15 +212,16 @@ id="menu_petty_cash_root" groups="hr_expense_petty_cash.group_petty_cash_manager,hr_expense_petty_cash.group_petty_cash_user" web_icon="hr_expense_petty_cash,static/description/odoo_icon.png" - sequence="40"/> + action="action_petty_cash" + sequence="1"/> - + /> --> hr_employee.extend.form hr.employee From 638a73ff4bb72d71015826c3c11e440d3d26042e Mon Sep 17 00:00:00 2001 From: zainab8585 Date: Wed, 26 Jun 2024 09:48:26 +0200 Subject: [PATCH 10/10] [FIX]FIX ISSUE --- .../hr_expense_petty_cash/views/petty_cash_views.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/odex25_accounting/hr_expense_petty_cash/views/petty_cash_views.xml b/odex25_accounting/hr_expense_petty_cash/views/petty_cash_views.xml index 0b171494a..1c4e945e3 100644 --- a/odex25_accounting/hr_expense_petty_cash/views/petty_cash_views.xml +++ b/odex25_accounting/hr_expense_petty_cash/views/petty_cash_views.xml @@ -212,16 +212,15 @@ id="menu_petty_cash_root" groups="hr_expense_petty_cash.group_petty_cash_manager,hr_expense_petty_cash.group_petty_cash_user" web_icon="hr_expense_petty_cash,static/description/odoo_icon.png" - action="action_petty_cash" - sequence="1"/> + sequence="40"/> - + /> hr_employee.extend.form hr.employee