From db6923a1f4c261dc91d8d481da143b37f07e1e60 Mon Sep 17 00:00:00 2001 From: ben Date: Tue, 10 Sep 2024 21:56:48 +0300 Subject: [PATCH] remove devcontainer files --- .devcontainer/devcontainer.json | 17 --------------- .github/workflows/windows_build.yml | 4 ++-- Dockerfile | 33 ----------------------------- main.cpp | 2 ++ 4 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 Dockerfile diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 5e0e694..0000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "Windows GTest Dev Container", - "dockerFile": "Dockerfile", - "context": ".", - "settings": { - "terminal.integrated.shell.windows": "C:\\Windows\\System32\\cmd.exe", - "cmake.configureOnOpen": true, - "cmake.buildDirectory": "${workspaceFolder}/build" - }, - "extensions": [ - "ms-vscode.cmake-tools", - "ms-vscode.cpptools", - "ms-vscode.makefile-tools" - ], - "postCreateCommand": "mkdir -p /workspace/build && cd /workspace/build && cmake ..", - "workspaceFolder": "/workspace" -} diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index 94169e8..dce6d1f 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -24,6 +24,6 @@ jobs: echo "preparing new build with cmake..." && cd build/ && cmake .. && - cmake --build . && - echo "Build complete!" + cmake --build . --config Debug + cd Debug shell: bash diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 8f0bbca..0000000 --- a/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# Use the official Windows Server Core image as the base -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# Install Chocolatey (a package manager for Windows) -RUN powershell -NoProfile -Command \ - Set-ExecutionPolicy Bypass -Scope Process -Force; \ - [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager+SecurityProtocolType]::Tls12; \ - iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - -# Install dependencies -RUN choco install -y \ - git \ - cmake \ - visualstudio2019buildtools \ - visualstudio2019-workload-vctools \ - visualstudio2019-workload-universal - -# Set up environment variables for MSBuild -ENV PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin;${PATH}" - -# Install Google Test -RUN git clone https://github.com/google/googletest.git C:\googletest && \ - mkdir C:\googletest\build && \ - cd C:\googletest\build && \ - cmake .. && \ - cmake --build . --config Release && \ - cmake --install . --config Release - -# Set the working directory -WORKDIR /workspace - -# Default command -CMD ["cmd.exe"] diff --git a/main.cpp b/main.cpp index 6e24c7e..8de32b6 100755 --- a/main.cpp +++ b/main.cpp @@ -5,7 +5,9 @@ #include #include #include +#ifndef _WIN32 #include +#endif #include static const std::string shared_mem_name{"/shmsh__47"};