Commit 4154b1c2 authored by norvell's avatar norvell
Browse files

Revert changes to build job rules -- breaks pipelines that depend on build jobs

parent f918ec85

.gitlab-ci.yml

+14 −11
Original line number Diff line number Diff line
@@ -183,16 +183,6 @@ stages: 
.activate-Werror-linux: &activate-Werror-linux

  - sed -i.bak "s/^# \(CFLAGS += -Werror\)/\1/" Makefile



.rules-build-jobs:

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web'

      when: never

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'schedule'

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never  



.rules-pytest-to-ref-short:

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare"
@@ -247,7 +237,6 @@ stages: 
    - ivas-basop-linux



.build-job-linux:

  extends: .rules-build-jobs

  stage: build

  timeout: "2 minutes"

  needs: []
@@ -580,6 +569,13 @@ clang-format-check: 


# ensure that codec builds on linux

build-codec-linux-make:

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web'

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'schedule'

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

  extends:

    - .build-job-linux

  script:
@@ -589,6 +585,13 @@ build-codec-linux-make: 


# ensure that codec builds on linux with instrumentation active

build-codec-linux-instrumented-make:

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web'

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'schedule'

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

  extends:

    - .build-job-linux

  timeout: "7 minutes"