diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 7bc9707..4b4c3bc 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -2,7 +2,6 @@ name: Build & Deploy on: push: branches: - - main - release jobs: @@ -15,14 +14,12 @@ jobs: run: docker build -t barotrauma-server:${{ github.sha }} . - name: Tag and push to local registry - if: github.ref_name == 'release' run: | docker tag barotrauma-server:${{ github.sha }} \ ${{ secrets.REGISTRY_ADDR }}/barotrauma-server:latest docker push ${{ secrets.REGISTRY_ADDR }}/barotrauma-server:latest - name: Deploy via SSH - if: github.ref_name == 'release' uses: appleboy/ssh-action@v1 with: host: ${{ secrets.SERVER_HOST }} diff --git a/commit b/commit index 949468d..5d4e5f9 100755 --- a/commit +++ b/commit @@ -6,6 +6,7 @@ if [ $# -eq 0 ]; then exit 1 fi +git pull --rebase origin main git add -A git commit -m "$*" git push origin main diff --git a/release b/release deleted file mode 100755 index 738b268..0000000 --- a/release +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -e - -git checkout release -git merge main -git push origin release -git checkout main