Commit 8c887500 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

bug fixes

parent b20edcf2

.idea/workspace.xml

+28 −14
Original line number Diff line number Diff line
@@ -22,20 +22,8 @@ 
  </component>

  <component name="ChangeListManager">

    <list default="true" id="f6475f6c-fa5c-4aae-8ed2-f2e23b9c0169" name="Changes" comment="added internal tests for problem 1">

      <change beforePath="$PROJECT_DIR$/.idea/hw2-config.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/hw2-config.iml" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeCache.txt" beforeDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.29.6/CMakeCCompiler.cmake" beforeDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.29.6/CMakeCXXCompiler.cmake" beforeDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.29.6/CMakeDetermineCompilerABI_C.bin" beforeDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.29.6/CMakeDetermineCompilerABI_CXX.bin" beforeDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.29.6/CompilerIdC/CMakeCCompilerId.c" beforeDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.29.6/CompilerIdC/CMakeCCompilerId.o" beforeDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.29.6/CompilerIdCXX/CMakeCXXCompilerId.cpp" beforeDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.29.6/CompilerIdCXX/CMakeCXXCompilerId.o" beforeDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeConfigureLog.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeConfigureLog.yaml" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-environment.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-environment.txt" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/cmake.check_cache" beforeDir="false" />

      <change beforePath="$PROJECT_DIR$/ci_cd/problem1.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ci_cd/problem1.yml" afterDir="false" />

    </list>

    <option name="SHOW_DIALOG" value="false" />

    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -94,6 +82,8 @@ 
      <workItem from="1727441862049" duration="1460000" />

      <workItem from="1727463911877" duration="1947000" />

      <workItem from="1727635232946" duration="125000" />

      <workItem from="1727635553626" duration="1104000" />

      <workItem from="1727650187899" duration="2239000" />

    </task>

    <task id="LOCAL-00001" summary="updated ci/cd">

      <option name="closed" value="true" />
@@ -175,7 +165,31 @@ 
      <option name="project" value="LOCAL" />

      <updated>1727635265588</updated>

    </task>

    <option name="localTasksCounter" value="11" />

    <task id="LOCAL-00011" summary="added internal tests for problem 1">

      <option name="closed" value="true" />

      <created>1727635570232</created>

      <option name="number" value="00011" />

      <option name="presentableId" value="LOCAL-00011" />

      <option name="project" value="LOCAL" />

      <updated>1727635570232</updated>

    </task>

    <task id="LOCAL-00012" summary="added internal tests for problem 1">

      <option name="closed" value="true" />

      <created>1727635654921</created>

      <option name="number" value="00012" />

      <option name="presentableId" value="LOCAL-00012" />

      <option name="project" value="LOCAL" />

      <updated>1727635654921</updated>

    </task>

    <task id="LOCAL-00013" summary="added internal tests for problem 1">

      <option name="closed" value="true" />

      <created>1727636619280</created>

      <option name="number" value="00013" />

      <option name="presentableId" value="LOCAL-00013" />

      <option name="project" value="LOCAL" />

      <updated>1727636619280</updated>

    </task>

    <option name="localTasksCounter" value="14" />

    <servers />

  </component>

  <component name="TypeScriptGeneratedFilesManager">

ci_cd/problem1.yml

+2 −2
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ internal_testing_problem_1: 
    - git clone https://trachten-gitlab:${INTERNAL_HW_TESTS}@agile.bu.edu/gitlab/ec327/ec327-staff/hw-tests/homework-two-internal.git

    - cp -f problem1.cpp problem1.h homework-two-internal/internal_tests/

    - cd homework-two-internal/internal_tests/

    - ls -lr .

    - make internalTestProblem1

    - RESULT=$(./internalTestProblem1 | tail -n 1)

    - ./internalTestProblem1 > /dev/null 2>&1

    - RESULT=$(cat output.txt | tail -n 1)

    - curl "https://agile.bu.edu/ec327_scripts/bestScores.pl?key=$MAGIC_KEY&file=MakeTotal&name=$GITLAB_USER_LOGIN&score=$RESULT"

  rules:

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