diff --git a/.github/workflows/HW3.yml b/.github/workflows/HW3.yml index c530b2a..c2648d0 100644 --- a/.github/workflows/HW3.yml +++ b/.github/workflows/HW3.yml @@ -14,7 +14,7 @@ permissions: jobs: build-and-run-job: env: - target_name: allocator + target_name: allocator_driver homework_label: HW3 cmake_preset: linux-release cmake_build_preset: linux-build-release @@ -41,9 +41,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - #- name: Update apt-get - # run: sudo apt-get update - - name: Build package ${{ env.target_name }} working-directory: ${{env.hw_path}} run: | @@ -101,38 +98,4 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ${{ env.deb_path }}/${{ env.target_name }}-${{ env.version }}-Linux.deb asset_name: ${{ env.target_name }}-${{ env.version }}-Linux.deb - asset_content_type: application/vnd.debian.binary-package - - - name: Create Doxygen - uses: mattnotmitt/doxygen-action@v1.1.0 - with: - doxyfile-path: ./Doxyfile - working-directory: ${{ env.hw_path }} - - - name: GitHub Pages Deployment - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./doc/html/ - enable_jekyll: false - allow_empty_commit: false - force_orphan: true - publish_branch: gh-pages - - # Build the HTML documentation - - name: Doxygen Action - uses: mattnotmitt/doxygen-action@v1.1.0 - with: - doxyfile-path: ${{ env.hw_path }}/Doxyfile - working-directory: . - - # Deploy the HTML documentation to GitHub Pages - - name: GH Pages Deployment - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ${{ env.hw_path }}/doc/html/ - enable_jekyll: false - allow_empty_commit: false - force_orphan: true - publish_branch: gh-pages + asset_content_type: application/vnd.debian.binary-package \ No newline at end of file diff --git a/HW3/CMakeLists.txt b/HW3/CMakeLists.txt index 9274fcc..fba23f9 100644 --- a/HW3/CMakeLists.txt +++ b/HW3/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required (VERSION 3.12) option(BUILD_TESTS "BuildTests" ON) +option(BUILD_BENCHMARK "BuildBenchmark" OFF) set(PROJECT_VERSION "0.0.3" CACHE INTERNAL "Version") project (allocator VERSION ${PROJECT_VERSION}) @@ -16,10 +17,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "$<0:>${CMAKE_BINARY_DIR}/lib") add_subdirectory(allocator_driver) add_subdirectory(allocator_lib) -add_subdirectory(benchmark) # Tests. -#if(BuildTests) - enable_testing() - add_subdirectory(tests) -#endif() +enable_testing() +add_subdirectory(tests) + +if(BuildBenchmark) + add_subdirectory(benchmark) +endif() \ No newline at end of file