Commit 94da46d5 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

enforcing branch names for labs

parent e039d012

ci_cd/lab0.yml

+6 −6
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ prebuild_lab_0: 
    - if: '$CI_COMMIT_REF_NAME == "lab0"'

  tags: [c++-17]



prebuild_lab_0_alt:

  stage: labm1

prebuild_lab_0_SKIP:

  stage: lab0

  script:

    - echo "Skipping Lab 0 checks because the branch name is not lab0"

  rules:
@@ -44,7 +44,7 @@ compile_lab_0: 
    paths:

      - base_0

  rules:

    - if: '$CI_COMMIT_REF_NAME != "lab0"'

    - if: '$CI_COMMIT_REF_NAME == "lab0"'

  dependencies:

    - prebuild_lab_0

  tags: [c++-17]
@@ -59,7 +59,7 @@ lint_lab_0: 
    paths:

      - base_0

  rules:

    - if: '$CI_COMMIT_REF_NAME != "lab0"'

    - if: '$CI_COMMIT_REF_NAME == "lab0"'

  dependencies:

    - prebuild_lab_0

  tags: [cppcheck]
@@ -73,7 +73,7 @@ test_lab_0: 
    - cd base_0/tests

    - make lab0

  rules:

    - if: '$CI_COMMIT_REF_NAME != "lab0"'

    - if: '$CI_COMMIT_REF_NAME == "lab0"'

  dependencies:

    - compile_lab_0

  tags: [c++-17]
@@ -87,6 +87,6 @@ internal_tests_lab_0: 
    - cd lab-tests/internal_tests

    - make lab0

  rules:

    - if: '$CI_COMMIT_REF_NAME != "lab0" && $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'

    - if: '$CI_COMMIT_REF_NAME == "lab0" && $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'



  tags: [ c++-17 ]

ci_cd/lab1.yml

+6 −6
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ prebuild_lab_1: 
    - if: '$CI_COMMIT_REF_NAME == "lab1"'

  tags: [c++-17]



prebuild_lab_1_alt:

  stage: labm1

prebuild_lab_1_SKIP:

  stage: lab1

  script:

    - echo "Skipping Lab 0 checks because the branch name is not lab1"

  rules:
@@ -46,7 +46,7 @@ compile_lab_1: 
  dependencies:

    - prebuild_lab_1

  rules:

    - if: '$CI_COMMIT_REF_NAME != "lab1"'

    - if: '$CI_COMMIT_REF_NAME == "lab1"'

  tags: [c++-17]



lint_lab_1:
@@ -61,7 +61,7 @@ lint_lab_1: 
  dependencies:

    - prebuild_lab_1

  rules:

    - if: '$CI_COMMIT_REF_NAME != "lab1"'

    - if: '$CI_COMMIT_REF_NAME == "lab1"'

  tags: [cppcheck]



test_lab_1:
@@ -75,7 +75,7 @@ test_lab_1: 
  dependencies:

    - compile_lab_1

  rules:

    - if: '$CI_COMMIT_REF_NAME != "lab1"'

    - if: '$CI_COMMIT_REF_NAME == "lab1"'

  tags: [c++-17]



# trigger internal tests only upon a merge request into master
@@ -87,5 +87,5 @@ internal_tests_lab_1: 
    - cd lab-tests/internal_tests

    - make lab1

  rules:

    - if: '$CI_COMMIT_REF_NAME != "lab0" && $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'

    - if: '$CI_COMMIT_REF_NAME == "lab0" && $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'

  tags: [ c++-17 ]

ci_cd/labm1.yml

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ prebuild_lab_m1: 
    - if: '$CI_COMMIT_REF_NAME == "lab-1"'

  tags: [c++-17]



prebuild_lab_m1_alt:

prebuild_lab_m1_SKIP:

  stage: labm1

  script:

    - echo "Skipping Lab -1 checks because the branch name is not lab-1"