diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a0a72c25d95251ea22a555076878206585411f0..49796a57dc10ed05b016d1abacb558cd572b0b0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,13 +57,6 @@ workflow: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable$/' -.rules_skip_if_docs: &rules_skip_if_docs - - if: - changes: - - .gitlab/* - - '*.md' - when: never - .cache_deps: cache: &cache_deps_configuration key: @@ -145,11 +138,27 @@ workflow: when: always expire_in: 1 week -.rules_should_test: &rules_should_test +.only_code_changes: &only_code_changes + changes: + - "**/*.go" + - MAKEFILE + - .gitlab-ci.yml + - "go.*" + - "**/*.proto" + +.rules_should_test_all: &rules_should_test_all - if: $CI_MERGE_REQUEST_IID - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable$/' +.rules_should_test_code: &rules_should_test_code + - if: $CI_MERGE_REQUEST_IID + <<: *only_code_changes + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + <<: *only_code_changes + - if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable$/' + <<: *only_code_changes + .rules_run_on_merge: &rules_run_on_merge # We only execute these rules in the main Gitaly repository. This is # because jobs which run conditionally when being merged may depend on @@ -195,8 +204,8 @@ build: - GO_VERSION: [ "1.19", "1.20" ] TEST_BOOT_ARGS: "--bundled-git" - GIT_VERSION: "v2.41.0" - rules: - - *rules_skip_if_docs + only: + <<: *only_code_changes build:binaries: needs: [] @@ -220,6 +229,8 @@ build:binaries: parallel: matrix: - GO_VERSION: [ "1.19", "1.20" ] + only: + <<: *only_code_changes test: <<: *test_definition @@ -241,8 +252,7 @@ test: - POSTGRES_VERSION: "11-alpine" TEST_TARGET: [ test, test-with-praefect ] rules: - - *rules_skip_if_docs - - *rules_should_test + - *rules_should_test_code test:pgbouncer: <<: *test_definition @@ -273,8 +283,7 @@ test:pgbouncer: # can reach Postgres. TEST_TARGET: "test-with-praefect" rules: - - *rules_skip_if_docs - - *rules_should_test + - *rules_should_test_code test:nightly: <<: *test_definition @@ -298,8 +307,7 @@ test:praefect_smoke: - ./_build/bin/praefect -config config.praefect.toml sql-ping - ./_build/bin/praefect -config config.praefect.toml sql-migrate rules: - - *rules_skip_if_docs - - *rules_should_test + - *rules_should_test_code test:sha256: @@ -309,8 +317,7 @@ test:sha256: - TEST_TARGET: [ test, test-with-praefect ] TEST_WITH_SHA256: "YesPlease" rules: - - *rules_skip_if_docs - - *rules_should_test + - *rules_should_test_code test:fips: @@ -337,7 +344,6 @@ test:fips: rules: # Automatically run the job when the FIPS label is set. - if: $CI_MERGE_REQUEST_LABELS =~ /FIPS/ - - *rules_skip_if_docs - *rules_run_on_merge test:macos: @@ -389,7 +395,6 @@ test:macos: after_script: - *test_after_script rules: - - *rules_skip_if_docs - *rules_run_on_merge artifacts: <<: *test_artifacts @@ -401,7 +406,7 @@ verify:docs: script: - make lint-docs rules: - - *rules_should_test + - *rules_should_test_all verify: needs: [] @@ -420,8 +425,7 @@ verify: - proto/go/gitalypb/* when: on_failure rules: - - *rules_skip_if_docs - - *rules_should_test + - *rules_should_test_code dbschema: needs: [] @@ -442,8 +446,7 @@ dbschema: - _support/praefect-schema.sql when: on_failure rules: - - *rules_skip_if_docs - - *rules_should_test + - *rules_should_test_code semgrep-sast: needs: [] @@ -453,8 +456,7 @@ semgrep-sast: rules: - if: $SAST_DISABLED when: never - - *rules_skip_if_docs - - *rules_should_test + - *rules_should_test_code license_scanning: needs: [] @@ -462,8 +464,7 @@ license_scanning: rules: - if: $LICENSE_SCANNING_DISABLED when: never - - *rules_skip_if_docs - - *rules_should_test + - *rules_should_test_all variables: LICENSE_FINDER_CLI_OPTS: '--aggregate-paths=.' @@ -473,7 +474,7 @@ secret_detection: rules: - if: $SECRET_DETECTION_DISABLED when: never - - *rules_should_test + - *rules_should_test_all build-proto-gem: needs: [] @@ -566,6 +567,7 @@ build-package-and-qa: GITALY_SERVER_ALTERNATIVE_REPO: $CI_PROJECT_URL ee: "true" rules: + - <<: *only_code_changes - if: $CI_MERGE_REQUEST_IID changes: - go.sum diff --git a/README.md b/README.md index 9ffa3ff71d581752f711a0a6b3fba0472a13a060..c3a2ec5da10356e6163953be65809e2046d7856d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ![Gitaly](https://gitlab.com/gitlab-org/gitaly/uploads/509123ed56bd51247996038c858db006/gitaly-wordmark-small.png) - +changed! **Quick Links**: [**Roadmap**][roadmap] | [Want to Contribute?](#contributing) | diff --git a/cmd/validate.go b/cmd/validate.go index 8c7e3cc53064e0358b3d421ee3f9d77277f0e5f5..10254fab48e0f1b4521d12e2a51d902abab5126f 100644 --- a/cmd/validate.go +++ b/cmd/validate.go @@ -28,6 +28,8 @@ func Validate(validator interface{ ValidateV2() error }, outWriter io.Writer, er return false } + fmt.Println("debug statement") + return true }