Merge remote master, keep local README, update CI
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user