Compare commits

...
Sign in to create a new pull request.

38 commits
develop ... dev

Author SHA1 Message Date
harid
932a283d7c Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
2026-07-03 17:00:57 +07:00
harid
ddbfc3e25e Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 55s
2026-06-29 14:31:57 +07:00
5727c79cc2 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m1s
2026-04-08 15:14:05 +07:00
adisak
31c16befa7 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m2s
2026-04-07 18:12:52 +07:00
adisak
ce4a8aa94a Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m7s
2026-04-07 17:44:12 +07:00
harid
9b01ff3a04 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 54s
2026-04-03 11:53:32 +07:00
harid
523bc0aa81 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m5s
2026-03-26 12:20:58 +07:00
harid
161e3ba71c Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
2026-03-23 09:37:56 +07:00
harid
f5766f302d build tag 2026-03-05 14:02:28 +07:00
fc0304c221 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m2s
* develop:
2026-02-20 17:32:19 +07:00
d45980e434 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop
* 'develop' of github.com:Frappet/bma-ehr-salary:
  แก้ไขสิทธิ์ PARENT ให้เห็นข้อมูลทั้งหมดทุกหน่วยงาน #54
2026-02-20 17:32:03 +07:00
harid
a45faaff8f Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m11s
2026-02-19 15:15:49 +07:00
ab5e915a59 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-salary into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m1s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-salary:
2026-01-29 11:36:24 +07:00
7fd6531f53 Merge branch 'develop' into dev
* develop:
  add: checkRootDna
2026-01-29 11:35:58 +07:00
418cad4817 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop
* 'develop' of github.com:Frappet/bma-ehr-salary:
  add: checkRootDna
  test script emp changetype-mutl
  test script change-multi
2026-01-29 00:43:28 +07:00
8ee823a4d8 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 55s
2026-01-28 17:46:22 +07:00
1fec0fcc8c Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2026-01-19 14:27:10 +07:00
1682f8ec5a Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m4s
2026-01-19 13:40:16 +07:00
harid
7bc7645443 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 48s
2025-12-12 09:57:44 +07:00
0d639a0f8a Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-salary into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 52s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-salary:
2025-11-26 21:40:48 +07:00
cbcdae7b71 Merge branch 'develop' into dev
* develop:
  #2034
  #2030
2025-11-26 21:40:43 +07:00
72916bd518 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 50s
2025-11-25 17:14:39 +07:00
cd862df3b1 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 49s
2025-11-25 14:39:45 +07:00
6c7b7d333e Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-salary into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 48s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-salary:
2025-11-04 09:08:10 +07:00
0446269014 Merge branch 'develop' into dev
* develop:
  revert code
  add length name validate post("{subId}")
  fix
  fix to thorw
2025-11-04 09:08:05 +07:00
ae36f73ebe Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-10-31 18:57:23 +07:00
3d0f228b8e Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-10-31 18:52:12 +07:00
d8be027583 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 52s
2025-10-31 18:41:19 +07:00
f4a2993a32 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 52s
2025-10-31 18:33:14 +07:00
d5e7a721ac Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 49s
2025-10-31 16:34:42 +07:00
harid
d299f86f86 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 51s
2025-10-24 17:26:42 +07:00
6479cbe331 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 48s
* develop:
  Merge pull request #53 from Frappet/issue/#1883
  sort เงินเดือน/ค่าจ้าง
  sort
  update cronjob snapshot
2025-10-22 11:07:30 +07:00
1130b31ee5 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 53s
2025-09-30 16:06:32 +07:00
ffe9e03a91 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 48s
2025-09-22 10:09:21 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
592a40ae5c feat: Add Discord Notification
Some checks failed
Build & Deploy on Dev / build (push) Failing after 38s
2025-09-16 14:36:51 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
261d05f88d Merge branch 'develop' into dev 2025-09-16 14:35:30 +07:00
6ec0085e31 Add .forgejo/workflows/ci-cd.yml 2025-09-10 11:57:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
248a38a610 forgejo 2025-09-09 09:47:02 +07:00
3 changed files with 162 additions and 0 deletions

View file

@ -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

View file

@ -0,0 +1,83 @@
# /.forgejo/workflows/build.yml
name: Build & Deploy on Dev
on:
push:
tags:
- "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: latest
DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }}
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.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:
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 API_SALARY "${{ env.IMAGE_VERSION }}"
./deploy.sh hrms-api-salary
- 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 }}

View file

@ -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 API_SALARY "${{ inputs.version }}"
./deploy.sh hrms-api-salary "${{ inputs.version }}"