Skip to content

Commit 7feae7e

Browse files
committed
Add mergesort.c to files to compile in GitHub Actions
This explicitly adds `mergesort.c` to the compile statement for `array_merge` in the GitHub Actions. Now I need to explain this in the README and make sure they understand what's going on there.
1 parent 5b05d14 commit 7feae7e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/arraymerge_gtest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Check out the code
3434
uses: actions/checkout@v2
3535
- name: Compile test code
36-
run: g++ -Wall -g -o array_merge_test array_merge.c array_merge_test.cpp -lgtest -pthread -std=c++0x
36+
run: g++ -Wall -g -o array_merge_test ../mergesort/mergesort.c array_merge.c array_merge_test.cpp -lgtest -pthread -std=c++0x
3737
working-directory: array_merge
3838
- name: Run test
3939
run: ./array_merge_test

.github/workflows/arraymerge_test_valgrind.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Check out the code
3636
uses: actions/checkout@v2
3737
- name: Compile code
38-
run: g++ -Wall -g -o array_merge_test array_merge.c array_merge_test.cpp -lgtest -pthread -std=c++0x
38+
run: g++ -Wall -g -o array_merge_test ../mergesort/mergesort.c array_merge.c array_merge_test.cpp -lgtest -pthread -std=c++0x
3939
working-directory: array_merge
4040
- name: Run test
4141
run: valgrind -v --leak-check=full --show-leak-kinds=all --error-exitcode=1 ./array_merge_test

0 commit comments

Comments
 (0)