diff --git a/.github/workflows/programming_team_code_ci.yml b/.github/workflows/programming_team_code_ci.yml index 89422aa9..35687504 100644 --- a/.github/workflows/programming_team_code_ci.yml +++ b/.github/workflows/programming_team_code_ci.yml @@ -24,7 +24,7 @@ jobs: git submodule init git submodule update rm -rf hackpack-cpp/tests/ - - name: Run tests + - name: Run library checker and aizu tests env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: oj-verify all --tle 60 --timeout 21600 @@ -40,7 +40,7 @@ jobs: wget -O - https://apt.llvm.org/llvm.sh | sudo bash - name: Install dependencies run: sudo apt update && sudo apt install -y clang-format-19 cppcheck - - name: checks format then lints + - name: grep, clang-format, cppcheck run: make --directory=tests/ grep_clangformat_cppcheck clangtidy: @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Compile all tests + - name: g++ with gcc run: make --directory=tests/ compile_gcc compile_clang: @@ -72,17 +72,17 @@ jobs: run: wget -qO- https://apt.llvm.org/llvm.sh | sudo bash -s -- 19 - name: Install dependencies run: sudo apt update && sudo apt install -y clang-19 - - name: Compile all tests + - name: g++ with clang run: make --directory=tests/ compile_clang - files_without_tests: + find_files_without_tests: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: files without tests - run: make --directory=tests/ files_without_tests + - name: find files without tests + run: make --directory=tests/ find_files_without_tests - build_ptc: + build_pdf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -92,8 +92,8 @@ jobs: sudo apt install texlive texlive-latex-extra rename nodejs npm wget -qO- https://apt.llvm.org/llvm.sh | sudo bash -s -- 19 sudo apt update && sudo apt install -y clang-19 - - name: build ptc - run: make --directory=tests/ ptc + - name: build pdf + run: make --directory=tests/ build_pdf - uses: actions/upload-artifact@v4 with: name: ptc @@ -101,7 +101,7 @@ jobs: publish_ptc: runs-on: ubuntu-latest - needs: [library_checker_aizu, grep_clangformat_cppcheck, clangtidy, compile_gcc, compile_clang, files_without_tests, build_ptc] + needs: [library_checker_aizu, grep_clangformat_cppcheck, clangtidy, compile_gcc, compile_clang, find_files_without_tests, build_pdf] if: github.ref == 'refs/heads/dev' && github.event_name == 'push' steps: - uses: actions/checkout@v2 @@ -119,7 +119,7 @@ jobs: update_main: runs-on: ubuntu-latest - needs: [library_checker_aizu, grep_clangformat_cppcheck, clangtidy, compile_gcc, compile_clang, files_without_tests] + needs: [library_checker_aizu, grep_clangformat_cppcheck, clangtidy, compile_gcc, compile_clang, find_files_without_tests] if: github.ref == 'refs/heads/dev' && github.event_name == 'push' steps: - uses: actions/checkout@v2 @@ -147,5 +147,5 @@ jobs: - uses: actions/checkout@v2 - name: Install dependencies run: sudo apt install shfmt shellcheck - - name: shellcheck and shfmt + - name: shellcheck, shfmt run: make --directory=tests/ shellcheck_shfmt diff --git a/tests/Makefile b/tests/Makefile index dc467340..0e663fd5 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -13,14 +13,14 @@ help: @echo " |" @echo "make clangtidy | runs clang-tidy (mainly to verify snake_case)" @echo " |" - @echo "make ptc | build ptc.pdf from .tex file" + @echo "make build_pdf | build build_pdf.pdf from .tex file" @echo " |" @echo "make shellcheck_shfmt | runs shellcheck and shfmt" @echo " |" @echo "make update_main | 1) copies included files into file" @echo " | 2) force pushes to main branch" @echo " |" - @echo "make files_without_tests | print list of all .hpp files included by *no* .test.cpp files" + @echo "make find_files_without_tests | print list of all .hpp files included by *no* .test.cpp files" @echo " | - these files are not compiled nor linted as part of ci" @echo " |" @echo "make print_which_tests_havent_run | mainly to check if all tests have run" @@ -40,11 +40,11 @@ do_format: clangtidy: ./scripts/clangtidy.sh -files_without_tests: - ./scripts/files_without_tests.sh +find_files_without_tests: + ./scripts/find_files_without_tests.sh -ptc: - ./scripts/ptc.sh +build_pdf: + ./scripts/build_pdf.sh shellcheck_shfmt: ./scripts/shellcheck_shfmt.sh diff --git a/tests/scripts/ptc.sh b/tests/scripts/build_pdf.sh similarity index 100% rename from tests/scripts/ptc.sh rename to tests/scripts/build_pdf.sh diff --git a/tests/scripts/files_without_tests.sh b/tests/scripts/find_files_without_tests.sh similarity index 100% rename from tests/scripts/files_without_tests.sh rename to tests/scripts/find_files_without_tests.sh