Merge remote master, keep local README, update CI
Build & Deploy / build (push) Failing after 20m41s
Build & Deploy / deploy (push) Has been skipped

This commit is contained in:
2026-07-18 15:15:06 +03:00
4 changed files with 61 additions and 24 deletions
+6 -6
View File
@@ -3,7 +3,7 @@ run-name: ${{ gitea.event_name }} by ${{ gitea.actor }}
on:
push:
branches: [main, master, develop]
branches: [main, master, dev]
pull_request:
branches: [main, master]
@@ -29,6 +29,11 @@ jobs:
- name: Test
run: ./gradlew --no-daemon test
deploy:
runs-on: ubuntu-24.04
needs: build
if: gitea.event_name == 'pull_request' && gitea.base_ref == 'master' && gitea.head_ref == 'dev'
steps:
- name: Build distribution
run: ./gradlew --no-daemon installDist
@@ -44,11 +49,6 @@ jobs:
docker push ${{ secrets.REGISTRY_URL }}/${{ gitea.repository }}:${{ gitea.sha }}
docker push ${{ secrets.REGISTRY_URL }}/${{ gitea.repository }}:latest
deploy:
runs-on: ubuntu-24.04
needs: build
if: gitea.ref == 'refs/heads/main' || gitea.ref == 'refs/heads/master'
steps:
- name: Deploy via SSH
uses: appleboy/ssh-action@v1
with: