Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

FIX (ci): Skip CI and CodeQL on a pull request from develop, since the push to main after its merge runs them

Rostislav Dugin4a83e5dac1b6
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
index 594c0359..12557889 100644
--- a/.github/workflows/ci-release.yml
+++ b/.github/workflows/ci-release.yml
@@ -20,9 +20,10 @@ concurrency:
group: ci-release-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
+# A pull request from develop runs no checks: the push to main after its merge runs them.
jobs:
lint-backend:
- if: github.ref != 'refs/heads/develop'
+ if: github.ref != 'refs/heads/develop' && github.head_ref != 'develop'
runs-on: ubuntu-24.04
timeout-minutes: 15
steps:
@@ -65,7 +66,7 @@ jobs:
git diff --exit-code go.mod go.sum || (echo "go mod tidy made changes, please run 'go mod tidy' and commit the changes" && exit 1)
lint-frontend:
- if: github.ref != 'refs/heads/develop'
+ if: github.ref != 'refs/heads/develop' && github.head_ref != 'develop'
runs-on: ubuntu-24.04
timeout-minutes: 15
steps:
@@ -98,7 +99,7 @@ jobs:
pnpm build
dockerfile-scan:
- if: github.ref != 'refs/heads/develop'
+ if: github.ref != 'refs/heads/develop' && github.head_ref != 'develop'
runs-on: ubuntu-24.04
timeout-minutes: 15
permissions:
@@ -122,7 +123,7 @@ jobs:
trivy config --severity HIGH,CRITICAL --exit-code 1 agent/verification/images/postgres/Dockerfile
test-frontend:
- if: github.ref != 'refs/heads/develop'
+ if: github.ref != 'refs/heads/develop' && github.head_ref != 'develop'
runs-on: ubuntu-24.04
timeout-minutes: 15
needs: [lint-frontend]
@@ -153,7 +154,7 @@ jobs:
pnpm test
lint-verification-agent:
- if: github.ref != 'refs/heads/develop'
+ if: github.ref != 'refs/heads/develop' && github.head_ref != 'develop'
runs-on: ubuntu-24.04
timeout-minutes: 15
steps:
@@ -188,7 +189,7 @@ jobs:
git diff --exit-code go.mod go.sum || (echo "go mod tidy made changes, please run 'go mod tidy' and commit the changes" && exit 1)
test-verification-agent:
- if: github.ref != 'refs/heads/develop'
+ if: github.ref != 'refs/heads/develop' && github.head_ref != 'develop'
runs-on: ubuntu-24.04
timeout-minutes: 15
needs: [lint-verification-agent]
@@ -213,7 +214,7 @@ jobs:
go test -race -count=1 -failfast ./internal/...
e2e-verification-agent:
- if: github.ref != 'refs/heads/develop'
+ if: github.ref != 'refs/heads/develop' && github.head_ref != 'develop'
runs-on: ubuntu-24.04
timeout-minutes: 30
needs: [lint-verification-agent]
@@ -239,7 +240,7 @@ jobs:
rm -rf artifacts || true
test-backend:
- if: github.ref != 'refs/heads/develop'
+ if: github.ref != 'refs/heads/develop' && github.head_ref != 'develop'
# 22.04 runs Linux 6.8. ubuntu-24.04 moved to Linux 7.0, where mongod 9.0 exits at startup:
# its kernel check reads Ubuntu's 7.0.0 release string as an rseq-incompatible kernel
# (SERVER-121912, SERVER-136848).
@@ -359,6 +360,7 @@ jobs:
go test -p=8 -count=1 -failfast -timeout 40m $packages
test-filesystems:
+ if: github.head_ref != 'develop'
runs-on: ubuntu-24.04
timeout-minutes: 45
steps:
@@ -621,7 +623,7 @@ jobs:
"${platform_image_refs[@]}"
build-image:
- if: github.ref != 'refs/heads/develop'
+ if: github.ref != 'refs/heads/develop' && github.head_ref != 'develop'
runs-on: ubuntu-24.04
timeout-minutes: 45
needs: [lint-backend, lint-frontend, lint-verification-agent, dockerfile-scan]
@@ -755,7 +757,7 @@ jobs:
rm -rf /tmp/databasus-smoke-data || true
build-verification-image:
- if: github.ref != 'refs/heads/develop'
+ if: github.ref != 'refs/heads/develop' && github.head_ref != 'develop'
runs-on: ubuntu-24.04
timeout-minutes: 45
needs: [lint-verification-agent, dockerfile-scan]
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 534e63f6..8ceaa55d 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -20,6 +20,8 @@ concurrency:
jobs:
analyze:
name: Analyze (${{ matrix.language }})
+ # A pull request from develop is analyzed by the push to main after its merge.
+ if: github.head_ref != 'develop'
runs-on: ubuntu-24.04
permissions:
security-events: write