diff --git a/.gitea/workflows/sgeupdated.yml b/.gitea/workflows/sgeupdated.yml index 1e8a5ee..e3cf264 100644 --- a/.gitea/workflows/sgeupdated.yml +++ b/.gitea/workflows/sgeupdated.yml @@ -1,15 +1,15 @@ name: sgeUpdated CI/CD on: - push: - branches: - - main pull_request: + types: + - closed # Fires when a PR is closed (either merged or manually closed) branches: - - main - + - main # Only when PR targets main + jobs: deploy: + if: github.event.pull_request.merged == true # Run only if the PR was merged (not just closed) runs-on: ubuntu-latest steps: @@ -23,7 +23,7 @@ jobs: - name: Run deploy script on server run: | ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF' - echo "✅ Connected to server. Running deploy script..." + echo "✅ PR merged into main — running deploy script..." cd /home/ubuntu/Bgreen/sgeUpdated ./deploy.sh EOF diff --git a/sge-backend/pom.xml b/sge-backend/pom.xml index d184823..e83965d 100644 --- a/sge-backend/pom.xml +++ b/sge-backend/pom.xml @@ -11,7 +11,7 @@ com.sgs sgs - 0.0.2-SNAPSHOT + 0.0.4-SNAPSHOT sgs SGS project for Spring Boot diff --git a/sge-frontend/package.json b/sge-frontend/package.json index c43d6c8..bee772e 100644 --- a/sge-frontend/package.json +++ b/sge-frontend/package.json @@ -1,6 +1,6 @@ { "name": "sgs-web", - "version": "1.0.2", + "version": "1.0.4", "private": true, "dependencies": { "@apollo/client": "^3.13.8",