Sqlite3server lesson32

.github/workflows/docs.yml

@@ -0,0 +1,25 @@
+    - name: Install Doxygen and Graphviz
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y doxygen graphviz
+
+    - name: Check dot version
+      # Эта команда покажет в логах, работает ли Graphviz вообще
+      run: dot -V 
+
+    - name: Generate Documentation
+      run: doxygen Doxyfile
+
+    - name: Check for generated images
+      # Это покажет, появились ли PNG файлы до деплоя
+      run: ls docs/html/*.png || echo "PNG FILES NOT FOUND"
+
+    - name: Add .nojekyll
+      run: touch ./docs/html/.nojekyll    
+
+    - name: Deploy
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./docs/html
+        publish_branch: gh-pages

.github/workflows/release.yml

@@ -1,40 +1,50 @@
-name: 'C++ CI'
+name: Build and Release
 
 on:
   push:
-    branches:
-      - master
-      - feature/github_actions
+    tags:
+      - 'v*'
 
 jobs:
-  build:
+  release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pages: write
+      id-token: write
     steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - run: sudo apt-get update && sudo apt-get install libboost-test-dev -y
-      - run: cmake . -DPATCH_VERSION=${{ github.run_number }} -DWITH_BOOST_TEST=ON
-      - run: cmake --build .
-      - run: cmake --build . --target test
-      - run: cmake --build . --target package
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v4
+
+      - name: Build in Docker
+        run: |
+          # 1. Собираем образ
+          docker build -t builder .
+
+          # 2. Создаем временный контейнер для копирования файлов
+          docker create --name extractor builder
+
+          # 3. Подготавливаем папки на сервере GitHub
+          mkdir -p dist
+
+          # 4. Копируем .deb пакет из папки /output контейнера
+          docker cp extractor:/output/. ./dist/
+
+          # 5. Копируем документацию. 
+          # Путь /build/docs/html так как в Doxyfile OUTPUT_DIRECTORY = docs
+          docker cp extractor:/build/docs/html/. ./dist-docs
+
+          # 6. Удаляем контейнер
+          docker rm extractor
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ github.run_number }}
-          release_name: Release ${{ github.run_number }}
-          draft: false
-          prerelease: false
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
+          files: dist/*.deb
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./helloworld-0.0.${{ github.run_number }}-Linux.deb
-          asset_name: helloworld-0.0.${{ github.run_number }}-Linux.deb
-          asset_content_type: application/vnd.debian.binary-package
+          folder: dist-docs
+          branch: gh-pages

.gitignore

@@ -0,0 +1,12 @@
+**/.idea/
+**/.settings/
+**/.vscode/
+**/build/
+**/debug/
+**/release/
+html/
+latex/
+*.deb
+dist/
+output/
+*.pdb

CMakeLists.txt

@@ -1,86 +1,55 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.15)
+project(sqlite3server VERSION 5.2.1)
 
-set(PATCH_VERSION "1" CACHE INTERNAL "Patch version")
-set(PROJECT_VESRION 0.0.${PATCH_VERSION})
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-project(helloworld VERSION ${PROJECT_VESRION})
+find_package(Boost REQUIRED COMPONENTS system)
+find_package(SQLite3 REQUIRED)
 
-option(WITH_BOOST_TEST "Whether to build Boost test" ON)
-
-configure_file(version.h.in version.h)
-
-add_executable(helloworld_cli main.cpp)
-add_library(helloworld lib.cpp)
-
-set_target_properties(helloworld_cli helloworld PROPERTIES
-    CXX_STANDARD 14
-    CXX_STANDARD_REQUIRED ON
+add_executable(sqlite3server
+    src/main.cpp
+    src/DatabaseManager.cpp
+    src/CommandParser.cpp
 )
 
-target_include_directories(helloworld
-    PRIVATE "${CMAKE_BINARY_DIR}"
+target_include_directories(sqlite3server
+    PRIVATE
+        src
+        ${SQLite3_INCLUDE_DIRS}
 )
 
-target_link_libraries(helloworld_cli PRIVATE
-    helloworld
+target_link_libraries(sqlite3server
+    PRIVATE
+        ${Boost_LIBRARIES}
+        ${SQLite3_LIBRARIES}
 )
 
-if(WITH_BOOST_TEST)
-    find_package(Boost COMPONENTS unit_test_framework REQUIRED)
-    add_executable(test_version test_version.cpp)
 
-    set_target_properties(test_version PROPERTIES
-        CXX_STANDARD 14
-        CXX_STANDARD_REQUIRED ON
-    )
+if(MSVC)
+    target_compile_options(sqlite3server PRIVATE /W4)
+else()
+    target_compile_options(sqlite3server PRIVATE -Wall -Wextra -pedantic)
+endif()
 
-    set_target_properties(test_version PROPERTIES
-        COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK
-        INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR}
-    )
 
-    target_link_libraries(test_version
-        ${Boost_LIBRARIES}
-        helloworld
-    )
-endif()
+install(TARGETS sqlite3server
+    RUNTIME DESTINATION bin
+)
 
-if (MSVC)
-    target_compile_options(helloworld_cli PRIVATE
-        /W4
-    )
-    target_compile_options(helloworld PRIVATE
-        /W4
-    )
-    if(WITH_BOOST_TEST)
-        target_compile_options(test_version PRIVATE
-            /W4
-        )
-    endif()
-else ()
-    target_compile_options(helloworld_cli PRIVATE
-        -Wall -Wextra -pedantic -Werror
-    )
-    target_compile_options(helloworld PRIVATE
-        -Wall -Wextra -pedantic -Werror
-    )
-    if(WITH_BOOST_TEST)
-        target_compile_options(test_version PRIVATE
-            -Wall -Wextra -pedantic -Werror
-        )
-    endif()
-endif()
+set(DEBIAN_TEMPLATE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/debian/templates")
+set(DEBIAN_OUTPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/debian")
 
-install(TARGETS helloworld_cli RUNTIME DESTINATION bin)
+set(DEBIAN_TEMPLATES control changelog rules)
 
-set(CPACK_GENERATOR DEB)
-set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
-set(CPACK_PACKAGE_CONTACT example@example.com)
-include(CPack)
+foreach(TEMPLATE ${DEBIAN_TEMPLATES})
+    configure_file(
+        "${DEBIAN_TEMPLATE_DIR}/${TEMPLATE}"
+        "${DEBIAN_OUTPUT_DIR}/${TEMPLATE}"
+        @ONLY
+    )
+endforeach()
 
-if(WITH_BOOST_TEST)
-    enable_testing()
-    add_test(test_version test_version)
-endif()
+if(EXISTS "${DEBIAN_OUTPUT_DIR}/rules")
+    file(CHMOD "${DEBIAN_OUTPUT_DIR}/rules" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+endif()

Dockerfile

@@ -0,0 +1,28 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    cmake \
+    doxygen \
+    graphviz \
+    devscripts \
+    debhelper \
+    dos2unix \
+    libboost-system-dev \
+	libsqlite3-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build
+COPY . .
+
+RUN doxygen Doxyfile || echo "Doxygen warnings ignored"
+
+RUN find debian -type f -exec dos2unix {} \; || true
+
+RUN chmod +x debian/rules
+
+RUN dpkg-buildpackage -b -us -uc
+
+RUN mkdir -p /output && cp /*.deb /output/
+
+VOLUME /output