From 805ed1c73e712495a2c04890ca6c2631c85e8b9f Mon Sep 17 00:00:00 2001 From: Suchin Sapphasitthatha Date: Tue, 4 Feb 2025 07:01:47 +0000 Subject: [PATCH 01/15] edit CI for UAT, PROD --- .onedev-buildspec.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml index 11620175..5c9f2032 100644 --- a/.onedev-buildspec.yml +++ b/.onedev-buildspec.yml @@ -1,4 +1,4 @@ -version: 37 +version: 38 jobs: - name: CI for UAT steps: @@ -40,7 +40,7 @@ jobs: name: build docker image dockerfile: ./docker/Dockerfile output: !RegistryOutput - tags: hrms-git.chin.in.th/bma-hrms/hrms-admin:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-admin:latest + tags: '@server@/bma-hrms/hrms-admin:@build_version@ @server@/bma-hrms/hrms-admin:latest' condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL triggers: - !TagCreateTrigger @@ -90,7 +90,7 @@ jobs: name: build docker image dockerfile: ./docker/Dockerfile output: !RegistryOutput - tags: hrms-git.bangkok.go.th/bma-hrms/hrms-admin:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-admin:latest + tags: '@server@/bma-hrms/hrms-admin:@build_version@ h@server@/bma-hrms/hrms-admin:latest' condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL triggers: - !TagCreateTrigger From 32eb6b0be3a40e0eb037adb1fb6fb94eeba153bb Mon Sep 17 00:00:00 2001 From: Suchin Sapphasitthatha Date: Tue, 4 Feb 2025 07:12:33 +0000 Subject: [PATCH 02/15] fix typo error --- .onedev-buildspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml index 5c9f2032..dd2bb798 100644 --- a/.onedev-buildspec.yml +++ b/.onedev-buildspec.yml @@ -90,7 +90,7 @@ jobs: name: build docker image dockerfile: ./docker/Dockerfile output: !RegistryOutput - tags: '@server@/bma-hrms/hrms-admin:@build_version@ h@server@/bma-hrms/hrms-admin:latest' + tags: '@server@/bma-hrms/hrms-admin:@build_version@ @server@/bma-hrms/hrms-admin:latest' condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL triggers: - !TagCreateTrigger From 761761cc01dca89d7e3e8d08836834fa27e6e716 Mon Sep 17 00:00:00 2001 From: "Warunee.T" Date: Mon, 15 Sep 2025 14:06:59 +0700 Subject: [PATCH 03/15] Create ci-cd.yml --- .forgejo/workflows/ci-cd.yml | 60 ++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .forgejo/workflows/ci-cd.yml diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml new file mode 100644 index 00000000..997e2225 --- /dev/null +++ b/.forgejo/workflows/ci-cd.yml @@ -0,0 +1,60 @@ +# /.forgejo/workflows/ci-cd.yml +name: Build & Deploy + +on: + push: + branch: + - dev + workflow_dispatch: + +env: + REGISTRY: ${{ vars.CONTAINER_REGISTRY }} + REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }} + CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}/${{ vars.CONTAINER_IMAGE_NAME }} + IMAGE_VERSION: build + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + config-inline: | + [registry."${{ env.REGISTRY }}"] + ca=["/etc/ssl/certs/ca-certificates.crt"] + - name: Tag Version + run: | + if [[ "${{ github.event_name }}" == "push" ]]; then + echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/dev//g' >> $GITHUB_ENV + else + echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV + fi + - name: Login in to registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ env.REGISTRY_USERNAME }} + password: ${{ env.REGISTRY_PASSWORD }} + - name: Build and push docker image + uses: docker/build-push-action@v3 + with: + platforms: linux/amd64 + context: . + file: ./docker/Dockerfile + tags: ${{ env.CONTAINER_IMAGE_NAME }}:latest,${{ env.CONTAINER_IMAGE_NAME }}:${{ env.IMAGE_VERSION }} + push: true + - name: Remote Deploy + uses: appleboy/ssh-action@v1.2.1 + with: + host: ${{ vars.SSH_DEPLOY_HOST }} + port: ${{ vars.SSH_DEPLOY_PORT }} + username: ${{ secrets.SSH_DEPLOY_USER }} + password: ${{ secrets.SSH_DEPLOY_PASSWORD }} + script: | + cd ~/repo + ./replace-env.sh APP_ADMIN "${{ env.IMAGE_VERSION }}" + ./deploy.sh hrms-admin From ef17aa64bcb9fb5c15b57f37a79e398c924476b8 Mon Sep 17 00:00:00 2001 From: "Warunee.T" Date: Mon, 15 Sep 2025 14:20:08 +0700 Subject: [PATCH 04/15] Create deploy.yml --- .forgejo/workflows/deploy.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .forgejo/workflows/deploy.yml diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml new file mode 100644 index 00000000..bbf6e68b --- /dev/null +++ b/.forgejo/workflows/deploy.yml @@ -0,0 +1,29 @@ +name: Build + +on: + workflow_dispatch: + inputs: + version: + description: "Version to deploy" + type: string + required: false + default: "latest" + +env: + IMAGE_VERSION: build + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - name: Remote Deploy + uses: appleboy/ssh-action@v1.2.1 + with: + host: ${{ vars.SSH_DEPLOY_HOST }} + port: ${{ vars.SSH_DEPLOY_PORT }} + username: ${{ secrets.SSH_DEPLOY_USER }} + password: ${{ secrets.SSH_DEPLOY_PASSWORD }} + script: | + cd ~/repo + ./replace-env.sh APP_ADMIN "${{ inputs.version }}" + ./deploy.sh hrms-admin From 2be2b102bd9fad09570e08bb3f009375b2cceeec Mon Sep 17 00:00:00 2001 From: "Warunee.T" Date: Mon, 15 Sep 2025 14:20:30 +0700 Subject: [PATCH 05/15] Create build.yml --- .forgejo/workflows/build.yml | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .forgejo/workflows/build.yml diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml new file mode 100644 index 00000000..e63417a0 --- /dev/null +++ b/.forgejo/workflows/build.yml @@ -0,0 +1,50 @@ +# /.forgejo/workflows/build.yml +name: Build + +on: + push: + tags: + - "v[0-9]+.[0-9]+.[0-9]+" + - "v[0-9]+.[0-9]+.[0-9]+*" + workflow_dispatch: + +env: + REGISTRY: ${{ vars.CONTAINER_REGISTRY }} + REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }} + CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}/${{ vars.CONTAINER_IMAGE_NAME }} + IMAGE_VERSION: build + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + config-inline: | + [registry."${{ env.REGISTRY }}"] + ca=["/etc/ssl/certs/ca-certificates.crt"] + - name: Tag Version + run: | + if [[ "${{ github.event_name }}" == "push" ]]; then + echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/v//g' >> $GITHUB_ENV + else + echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV + fi + - name: Login in to registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ env.REGISTRY_USERNAME }} + password: ${{ env.REGISTRY_PASSWORD }} + - name: Build and push docker image + uses: docker/build-push-action@v3 + with: + platforms: linux/amd64 + context: . + file: ./docker/Dockerfile + tags: ${{ env.CONTAINER_IMAGE_NAME }}:latest,${{ env.CONTAINER_IMAGE_NAME }}:${{ env.IMAGE_VERSION }} + push: true From aa05f3f994beedefe1af89766ae834f47bc1db49 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 15 Sep 2025 14:27:30 +0700 Subject: [PATCH 06/15] test ci cd at push to branch dev --- .forgejo/workflows/ci-cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index 997e2225..5a1bd72b 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -1,10 +1,10 @@ # /.forgejo/workflows/ci-cd.yml -name: Build & Deploy +name: Build & Deploy to Forgejo on: push: - branch: - - dev + branch: + - dev workflow_dispatch: env: From ef1ff60e78ca46bcd1c2e61b890185c7e91603fb Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 15 Sep 2025 14:38:49 +0700 Subject: [PATCH 07/15] test ci cd --- .forgejo/workflows/ci-cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index 5a1bd72b..d5d6f2dd 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -3,8 +3,8 @@ name: Build & Deploy to Forgejo on: push: - branch: - - dev + branches: + - dev workflow_dispatch: env: From 0286b347cf46705a2c19926fca9e758e5890e393 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 15 Sep 2025 14:44:21 +0700 Subject: [PATCH 08/15] test build and deploy --- .forgejo/workflows/ci-cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index d5d6f2dd..d5ff89a8 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -1,10 +1,10 @@ # /.forgejo/workflows/ci-cd.yml -name: Build & Deploy to Forgejo +name: Build & Deploy on: push: - branches: - - dev + branches: + - dev workflow_dispatch: env: From 750d46a8ebe6b92e7768ea0a6ce4d34daa24eca4 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 15 Sep 2025 17:22:41 +0700 Subject: [PATCH 09/15] fix tag ci cd --- .forgejo/workflows/ci-cd.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index d5ff89a8..0d0c3941 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -28,11 +28,7 @@ jobs: ca=["/etc/ssl/certs/ca-certificates.crt"] - name: Tag Version run: | - if [[ "${{ github.event_name }}" == "push" ]]; then - echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/dev//g' >> $GITHUB_ENV - else - echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV - fi + echo "IMAGE_VERSION=latest" >> $GITHUB_ENV - name: Login in to registry uses: docker/login-action@v2 with: From 60b9bd7a8f6d9074b081ebf975a76ab83db45807 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 16 Sep 2025 11:37:36 +0700 Subject: [PATCH 10/15] fix cidi noti --- .forgejo/workflows/ci-cd.yml | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index 0d0c3941..8483192c 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -1,5 +1,5 @@ # /.forgejo/workflows/ci-cd.yml -name: Build & Deploy +name: Build & Deploy on Dev on: push: @@ -12,7 +12,8 @@ env: REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }} REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }} CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}/${{ vars.CONTAINER_IMAGE_NAME }} - IMAGE_VERSION: build + IMAGE_VERSION: latest + DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }} jobs: build: @@ -28,7 +29,7 @@ jobs: ca=["/etc/ssl/certs/ca-certificates.crt"] - name: Tag Version run: | - echo "IMAGE_VERSION=latest" >> $GITHUB_ENV + echo "IMAGE_VERSION=latest" - name: Login in to registry uses: docker/login-action@v2 with: @@ -54,3 +55,25 @@ jobs: cd ~/repo ./replace-env.sh APP_ADMIN "${{ env.IMAGE_VERSION }}" ./deploy.sh hrms-admin + + - name: Discord Notification + if: always() + run: | + STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}" + COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}" + TIMESTAMP=$(date -u +%Y-%m-%dT%H:%M:%SZ) + curl -H "Content-Type: application/json" \ + -X POST \ + -d "{ + \"embeds\": [{ + \"title\": \"$STATUS\", + \"description\": \"**Build & Deploy**\\n- Image: \`${{ env.CONTAINER_IMAGE_NAME }}\`\\n- Version: \`${{ env.IMAGE_VERSION }}\`\\n- By: \`${{ github.actor }}\`\", + \"color\": $COLOR, + \"footer\": { + \"text\": \"Release Notification\", + \"icon_url\": \"https://example.com/success-icon.png\" + }, + \"timestamp\": \"$TIMESTAMP\" + }] + }" \ + ${{ env.DISCORD_WEBHOOK }} From a2a1341fbf8ca67b77458e57c0a4b01f2ab9463c Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 21 Oct 2025 18:21:52 +0700 Subject: [PATCH 11/15] fix:bug --- src/modules/03_logs/components/LogTable.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/03_logs/components/LogTable.vue b/src/modules/03_logs/components/LogTable.vue index f4d9be6e..f51c62f6 100644 --- a/src/modules/03_logs/components/LogTable.vue +++ b/src/modules/03_logs/components/LogTable.vue @@ -626,12 +626,10 @@ onMounted(async () => { :options="statusOpt" option-value="id" option-label="name" - lazy-rules hide-bottom-space borderless outlined style="width: 150px" - :hide-dropdown-icon="false" @update:modelValue="selectedDate()" clearable > @@ -1093,9 +1091,9 @@ onMounted(async () => { background-color: #eeeeee; } -.dp__action_row { +/*.dp__action_row { padding: 2px !important; -} +}*/ .tree-container { overflow: auto; From aac4ae9a08f7c37728f9a87abb8a2ab5898cfc8e Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 29 Oct 2025 15:18:57 +0700 Subject: [PATCH 12/15] fix:test --- src/modules/03_logs/components/LogTable.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/03_logs/components/LogTable.vue b/src/modules/03_logs/components/LogTable.vue index f51c62f6..10fb1d80 100644 --- a/src/modules/03_logs/components/LogTable.vue +++ b/src/modules/03_logs/components/LogTable.vue @@ -629,12 +629,12 @@ onMounted(async () => { hide-bottom-space borderless outlined - style="width: 150px" + style="width: 160px" @update:modelValue="selectedDate()" clearable > From ac432e0b89a7d010044887a38003235bec0e9d00 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 29 Oct 2025 15:22:59 +0700 Subject: [PATCH 13/15] fix:test --- src/modules/03_logs/components/LogTable.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/03_logs/components/LogTable.vue b/src/modules/03_logs/components/LogTable.vue index 10fb1d80..cc11e523 100644 --- a/src/modules/03_logs/components/LogTable.vue +++ b/src/modules/03_logs/components/LogTable.vue @@ -634,7 +634,8 @@ onMounted(async () => { clearable > From 7a26bfb59f7c9ad1133762dc2cba5643e8368bd4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 5 Mar 2026 15:10:16 +0700 Subject: [PATCH 14/15] fix: build on tag --- .forgejo/workflows/build.yml | 12 ++++++------ .forgejo/workflows/ci-cd.yml | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index e63417a0..ad4cf7e6 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -1,12 +1,12 @@ # /.forgejo/workflows/build.yml name: Build -on: - push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+" - - "v[0-9]+.[0-9]+.[0-9]+*" - workflow_dispatch: +# on: +# push: +# tags: +# - "v[0-9]+.[0-9]+.[0-9]+" +# - "v[0-9]+.[0-9]+.[0-9]+*" +# workflow_dispatch: env: REGISTRY: ${{ vars.CONTAINER_REGISTRY }} diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index 8483192c..a69a8554 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -3,8 +3,9 @@ name: Build & Deploy on Dev on: push: - branches: - - dev + tags: + - "v[0-9]+.[0-9]+.[0-9]+" + - "v[0-9]+.[0-9]+.[0-9]+*" workflow_dispatch: env: From 97348f2ecd759ad3e13beb84ce113347220368d7 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 20 Apr 2026 21:15:06 +0700 Subject: [PATCH 15/15] fix build version --- .forgejo/workflows/ci-cd.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index a69a8554..0463a093 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -4,8 +4,8 @@ name: Build & Deploy on Dev on: push: tags: - - "v[0-9]+.[0-9]+.[0-9]+" - - "v[0-9]+.[0-9]+.[0-9]+*" + - 'v[0-9]+.[0-9]+.[0-9]+' + # - 'version-[0-9]+.[0-9]+.[0-9]+' workflow_dispatch: env: @@ -30,7 +30,11 @@ jobs: ca=["/etc/ssl/certs/ca-certificates.crt"] - name: Tag Version run: | - echo "IMAGE_VERSION=latest" + if [ "${{ github.ref_type }}" == "tag" ]; then + echo "IMAGE_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV + else + echo "IMAGE_VERSION=latest" >> $GITHUB_ENV + fi - name: Login in to registry uses: docker/login-action@v2 with: @@ -54,7 +58,7 @@ jobs: password: ${{ secrets.SSH_DEPLOY_PASSWORD }} script: | cd ~/repo - ./replace-env.sh APP_ADMIN "${{ env.IMAGE_VERSION }}" + ./replace-env.sh APP_CHECKIN "${{ env.IMAGE_VERSION }}" ./deploy.sh hrms-admin - name: Discord Notification