Commit 2becdc97 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Renaming for consistency.

parent 6bf845ab

ci_cd/.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line 
stages:

  - problem0

  - problem1

  - problem1b

  - problem1c



include:

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

  - local: 'ci_cd/problem1.yml'   # RationalP

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

  - local: 'ci_cd/problem1c.yml'   # RationalP



default:

  timeout: 5m

ci_cd/problem0.yml→ci_cd/problem1b.yml

+8 −8
Original line number Diff line number Diff line 
prebuild_problem0:

  stage: problem0

prebuild_problem_1b:

  stage: problem1b

  script:

    - |

      # Check if source files exist
@@ -16,15 +16,15 @@ prebuild_problem0: 
  tags: [c++-17]





test_problem_0:

  stage: problem0

test_problem_1b:

  stage: problem1b

  dependencies:

    - prebuild_problem0

    - prebuild_problem_1b

  script:

    - cp IntegerP.cpp hw0/tests

    - cd hw0/tests

    - make problem0

    - ./problem0

    - make problem1b

    - ./problem1b

  rules:

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

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

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

ci_cd/problem1.yml→ci_cd/problem1c.yml

+8 −8
Original line number Diff line number Diff line 
prebuild_problem1:

  stage: problem1

prebuild_problem_1c:

  stage: problem1c

  script:

    - |

      # Check if source files exist
@@ -20,16 +20,16 @@ prebuild_problem1: 
  tags: [c++-17]





test_problem_1:

  stage: problem1

test_problem_1c:

  stage: problem1c

  dependencies:

    - prebuild_problem1

    - prebuild_problem_1c

  script:

    - cp IntegerP.cpp hw0/tests

    - cp RationalP.cpp hw0/tests

    - cd hw0/tests

    - make problem1

    - ./problem1

    - make problem1c

    - ./problem1c

  rules:

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

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

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

tests/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ PROBLEM1_OBJS = testRationalP.o RationalP.o IntegerP.o 
OBJS = $(PROBLEM0_OBJS) $(PROBLEM1_OBJS)



# Executable names

PROBLEM0_EXEC = problem0

PROBLEM1_EXEC = problem1

PROBLEM0_EXEC = problem1b

PROBLEM1_EXEC = problem1c



# Default target to build the executable

all: $(PROBLEM0_EXEC) $(PROBLEM1_EXEC)