diff --git a/.gitea/workflows/build-and-push.yml b/.gitea/workflows/build-and-push.yml index d20b823..9fa9fef 100644 --- a/.gitea/workflows/build-and-push.yml +++ b/.gitea/workflows/build-and-push.yml @@ -8,7 +8,19 @@ on: jobs: build-and-push: - if: ${{ github.event_name != 'workflow_run' || (github.event.workflow_run.conclusion == 'success' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'refs/heads/main')) }} + if: ${{ github.event_name != 'workflow_run' || ( + github.event.workflow_run.conclusion == 'success' && ( + github.event.workflow_run.head_branch == 'main' || + github.event.workflow_run.head_branch == 'refs/heads/main' || + ( + !github.event.workflow_run.head_branch && ( + github.event.workflow_run.repository.default_branch == 'main' || + github.event.workflow_run.repository.default_branch == 'refs/heads/main' || + github.event.repository.default_branch == 'main' || + github.event.repository.default_branch == 'refs/heads/main' + ) + ) + ) }} runs-on: ubuntu-latest env: DEFAULT_BRANCH: main @@ -19,6 +31,8 @@ jobs: REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} WORKFLOW_RUN_HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }} WORKFLOW_RUN_HEAD_SHA: ${{ github.event.workflow_run.head_sha }} + WORKFLOW_RUN_REPO_DEFAULT_BRANCH: ${{ github.event.workflow_run.repository.default_branch }} + REPOSITORY_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} steps: - name: Checkout code uses: actions/checkout@v4 @@ -35,6 +49,14 @@ jobs: ref_name="${WORKFLOW_RUN_HEAD_BRANCH}" fi + if [ -z "$ref_name" ] && [ -n "${WORKFLOW_RUN_REPO_DEFAULT_BRANCH:-}" ]; then + ref_name="${WORKFLOW_RUN_REPO_DEFAULT_BRANCH}" + fi + + if [ -z "$ref_name" ] && [ -n "${REPOSITORY_DEFAULT_BRANCH:-}" ]; then + ref_name="${REPOSITORY_DEFAULT_BRANCH}" + fi + if [ -z "$sha" ] && [ -n "${WORKFLOW_RUN_HEAD_SHA:-}" ]; then sha="${WORKFLOW_RUN_HEAD_SHA}" fi diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 0164323..2ba69ee 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -8,7 +8,19 @@ on: jobs: deploy: - if: ${{ github.event_name != 'workflow_run' || (github.event.workflow_run.conclusion == 'success' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'refs/heads/main')) }} + if: ${{ github.event_name != 'workflow_run' || ( + github.event.workflow_run.conclusion == 'success' && ( + github.event.workflow_run.head_branch == 'main' || + github.event.workflow_run.head_branch == 'refs/heads/main' || + ( + !github.event.workflow_run.head_branch && ( + github.event.workflow_run.repository.default_branch == 'main' || + github.event.workflow_run.repository.default_branch == 'refs/heads/main' || + github.event.repository.default_branch == 'main' || + github.event.repository.default_branch == 'refs/heads/main' + ) + ) + ) }} runs-on: ubuntu-latest env: DEFAULT_BRANCH: main @@ -19,6 +31,8 @@ jobs: REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} WORKFLOW_RUN_HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }} WORKFLOW_RUN_HEAD_SHA: ${{ github.event.workflow_run.head_sha }} + WORKFLOW_RUN_REPO_DEFAULT_BRANCH: ${{ github.event.workflow_run.repository.default_branch }} + REPOSITORY_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} steps: - name: SSH and deploy uses: appleboy/ssh-action@master diff --git a/.gitea/workflows/test-e2e.yml b/.gitea/workflows/test-e2e.yml index 55152b5..f0ca1fb 100644 --- a/.gitea/workflows/test-e2e.yml +++ b/.gitea/workflows/test-e2e.yml @@ -17,8 +17,23 @@ jobs: name: E2E Tests if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || - (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' && - (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'refs/heads/main')) }} + ( + github.event_name == 'workflow_run' && + github.event.workflow_run.conclusion == 'success' && + ( + github.event.workflow_run.head_branch == 'main' || + github.event.workflow_run.head_branch == 'refs/heads/main' || + ( + !github.event.workflow_run.head_branch && + ( + github.event.workflow_run.repository.default_branch == 'main' || + github.event.workflow_run.repository.default_branch == 'refs/heads/main' || + github.event.repository.default_branch == 'main' || + github.event.repository.default_branch == 'refs/heads/main' + ) + ) + ) + ) }} runs-on: ubuntu-latest container: mcr.microsoft.com/playwright/python:v1.55.0-jammy env: