From 0f9ce9b711f686ac8f3a7243ddeb8da0bc4b8b7a Mon Sep 17 00:00:00 2001 From: Graham McIntire Date: Tue, 17 Mar 2026 16:21:44 -0500 Subject: [PATCH] feat/ssl-certificate-check (#65) Reviewed-on: https://git.mcintire.me/graham/towerops-web/pulls/65 --- .forgejo/workflows/production.yaml | 4 ++-- .forgejo/workflows/staging.yaml | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/production.yaml b/.forgejo/workflows/production.yaml index 37ba218e..f887e6dd 100644 --- a/.forgejo/workflows/production.yaml +++ b/.forgejo/workflows/production.yaml @@ -3,7 +3,7 @@ name: Production Deployment on: push: branches: - - production + - main env: REGISTRY: git.mcintire.me @@ -287,7 +287,7 @@ jobs: git config user.email "actions@git.mcintire.me" git add k8s/deployment.yaml git commit -m "chore: update production image to ${IMAGE_TAG} [skip ci]" || echo "No changes to commit" - git push origin production + git push origin HEAD:production - name: Deployment summary run: | diff --git a/.forgejo/workflows/staging.yaml b/.forgejo/workflows/staging.yaml index ab7f1cf2..3afb7e9e 100644 --- a/.forgejo/workflows/staging.yaml +++ b/.forgejo/workflows/staging.yaml @@ -1,22 +1,20 @@ name: Deploy to Staging on: - push: - branches: - - main + pull_request: + types: [opened, synchronize, reopened] env: DOCKER_BUILDKIT: 1 DOCKER_TLS_CERTDIR: "" concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.head_ref }} cancel-in-progress: true jobs: deploy-staging: name: Deploy to Dokku Staging - if: github.ref == 'refs/heads/main' runs-on: ubuntu-22.04 steps: - name: Checkout code @@ -36,5 +34,6 @@ jobs: ssh dokku@204.110.191.231 apps:unlock towerops || true git remote add dokku dokku@204.110.191.231:towerops || true git fetch dokku || true - git push dokku main:main --force + # Deploy the PR branch to staging + git push dokku HEAD:main --force