Commit a6f04b72 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

bug fix

parent c1132dc2

ci_cd/.gitlab-ci.yml

+1 −8
Original line number Diff line number Diff line
@@ -5,16 +5,9 @@ stages: 
  - extra

  - internal



.default:

  rules:

    - when: on_success

default:

  timeout: 5m



.skip_when_internal:

  rules:

    - if: '$INTERNAL_TESTS == "1"'

      when: never

    - when: on_success



include:

  - local: 'ci_cd/problem1b.yml'   # IntegerP

ci_cd/problem1b.yml

+6 −3
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ extra_1b: 
    - job: exec_problem_1b

      artifacts: true

  script:

    - echo $INTERNAL_TESTS

    - git clone https://trachten-gitlab:${HW_INTERNAL}@agile.bu.edu/gitlab/ec330/ec330_staff/homeworks_internal/hw0_ec.git hw0_ec

    - cp IntegerP.cpp hw0_ec/

    - cd hw0_ec
@@ -62,7 +61,10 @@ extra_1b: 
    - curl "https://agile.bu.edu/ec330_scripts/saveScores.pl?key=${MAGIC_KEY}&file=extra1b&name=${GITLAB_USER_LOGIN}&score=${score}"

  rules:

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

  extends: .skip_when_internal

      when: on_success

    - if: '$INTERNAL_TESTS == "1"' # skip when doing internal tests

      when: never

    - when: never

  tags: [ c++-17 ]



more_integerp:
@@ -77,3 +79,4 @@ more_integerp: 
    - curl "https://agile.bu.edu/ec330_scripts/saveScores.pl?key=${MAGIC_KEY}&file=hw0_more1b&name=${GITLAB_USER_LOGIN}&score=${score}" # log the score for easy grading

  rules:

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

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

ci_cd/problem1c.yml

+4 −1
Original line number Diff line number Diff line
@@ -65,7 +65,10 @@ extra_1c: 
    - curl "https://agile.bu.edu/ec330_scripts/saveScores.pl?key=${MAGIC_KEY}&file=extra1c&name=${GITLAB_USER_LOGIN}&score=${score}"

  rules:

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

  extends: .skip_when_internal

      when: on_success

    - if: '$INTERNAL_TESTS == "1"' # skip when doing internal tests

      when: never

    - when: never

  tags: [c++-17]



more_rationalp: