Merge branch 'dev' into develop
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m51s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m51s
This commit is contained in:
commit
5bcf07c306
3 changed files with 16 additions and 11 deletions
|
|
@ -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 }}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,11 @@ name: Build & Deploy on Dev
|
|||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- dev
|
||||
# branches:
|
||||
# - dev
|
||||
tags:
|
||||
- "v[0-9]+.[0-9]+.[0-9]+"
|
||||
- "v[0-9]+.[0-9]+.[0-9]+*"
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
|
|
@ -29,7 +32,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:
|
||||
|
|
|
|||
|
|
@ -745,8 +745,6 @@ onMounted(async () => {
|
|||
/>
|
||||
</div>
|
||||
</q-card-section>
|
||||
|
||||
|
||||
</q-card>
|
||||
|
||||
<!-- แสดง dialog เลือกหน่วยงาน/ส่วนราชการ -->
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue