Commit 99d6214e authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

working on same-stage dependencies

parent 50a5e67f

ci_cd/lab0.yml

+0 −11
Original line number Diff line number Diff line 
### Lab 0

first_job_0:

  stage: lab0

  script:

    - echo "Testing lab 0"



prebuild_lab_0:

  stage: lab0

  script:
@@ -27,8 +22,6 @@ compile_lab_0: 
    paths:

      - base_0

      - lab0.*

  needs:

    - prebuild_lab_0

  tags: [c++-17]



lint_lab_0:
@@ -37,8 +30,6 @@ lint_lab_0: 
    - echo "Static code check of lab0.cpp"

    - cppcheck --check-config --enable=all --inconclusive --error-exitcode=1 lab0.cpp tests/LabZero.cpp

  allow_failure: false

  needs:

    - compile_lab_0

  artifacts:

    paths:

      - base_0
@@ -52,6 +43,4 @@ test_lab_0: 
    - cp lab0.o base_0/tests

    - cd base_0/tests

    - make lab0

  needs:

    - lint_lab_0

  tags: [c++-17]
 
 No newline at end of file

ci_cd/lab1.yml

+0 −12
Original line number Diff line number Diff line 
### Lab 1

first_job_1:

  stage: lab1

  script:

    - echo "Testing lab 1"





prebuild_lab_1:

  stage: lab1

  script:
@@ -28,8 +22,6 @@ compile_lab_1: 
    paths:

      - base_1

      - lab1.*

  needs:

    - prebuild_lab_1

  tags: [c++-17]



lint_lab_1:
@@ -38,8 +30,6 @@ lint_lab_1: 
    - echo "Static code check of lab1.cpp"

    - cppcheck --check-config --enable=all --inconclusive --error-exitcode=1 lab1.cpp tests/LabOne.cpp

  allow_failure: false

  needs:

    - compile_lab_1

  artifacts:

    paths:

      - base_1
@@ -53,6 +43,4 @@ test_lab_1: 
    - cp lab1.o base_1/tests

    - cd base_1/tests

    - make lab1

  needs:

    - lint_lab_1

  tags: [c++-17]
 
 No newline at end of file

ci_cd/labm1.yml

+0 −11
Original line number Diff line number Diff line 
### Lab -1

first_job_m1:

  stage: labm1

  script:

    - echo "Testing lab -1"



prebuild_lab_m1:

  stage: labm1

  script:
@@ -22,8 +17,6 @@ compile_lab_m1: 
  script:

    - echo "Compiling lab-1.cpp"

    - g++ -c lab-1.cpp

  needs:

    - prebuild_lab_m1

  tags: [c++-17]



lint_lab_m1:
@@ -32,8 +25,6 @@ lint_lab_m1: 
      - echo "Static code check of lab-1.cpp"

      - cppcheck --enable=all --inconclusive --error-exitcode=1 lab-1.cpp

  allow_failure: false

  needs:

    - compile_lab_m1

  tags: [cppcheck]



# don't run the test in the master branch
@@ -48,6 +39,4 @@ test_lab_m1: 
        echo "Could not find your WikiName $GITLAB_USER_LOGIN in file lab-1.cpp";

        exit 1;

      fi

  needs:

    - lint_lab_m1

  tags: [shell]
 
 No newline at end of file