ci: remove conan profiles

EndstoneMC · Jun 17, 2024 · 8008d71 · 8008d71
1 parent a7f9c79
commit 8008d71
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 37 deletions.
diff --git a/.github/conan_profiles/linux b/.github/conan_profiles/linux
diff --git a/.github/conan_profiles/windows b/.github/conan_profiles/windows
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -50,7 +50,7 @@ jobs:
           pip install conan
           conan profile detect --force
           conan export third_party/funchook --version 1.1.3
-          conan install . --build=missing -pr:a .github/conan_profiles/linux -s build_type=Debug
+          conan install . --build=missing -s compiler.cppstd=17 -s build_type=Debug -c tools.cmake.cmaketoolchain:generator=Ninja
 
       - name: Build with CMake
         run: |

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -56,4 +56,4 @@ jobs:
           pip install conan
           conan profile detect --force
           conan export third_party/funchook --version 1.1.3
-          conan create . --build=missing -pr:a .github/conan_profiles/linux -s build_type=${{ matrix.build_type }}
+          conan create . --build=missing -s compiler.cppstd=17 -s build_type=${{ matrix.build_type }} -c tools.cmake.cmaketoolchain:generator=Ninja
diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         python: [ "3.9", "3.10", "3.11", "3.12" ]
 
-    runs-on: windows-2022
+    runs-on: windows-2019
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

diff --git a/.github/workflows/windows-portable.yml b/.github/workflows/windows-portable.yml
@@ -12,7 +12,7 @@ permissions: read-all
 
 jobs:
   build:
-    runs-on: windows-2022
+    runs-on: windows-2019
     env:
       WP_URL: https://github.com/winpython/winpython/releases/download/7.5.20240410final/Winpython64-3.12.3.0dot.exe
       WP_SHA256: beef54eba558559255a73e59ae1986e8d06a6b12b55e78645ab42b4d6974e124

diff --git a/pyproject.toml b/pyproject.toml
@@ -58,18 +58,14 @@ install.strip = false
 metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
 sdist.include = ["python/src/endstone/_internal/version.py"]
 
+[tool.scikit-build-core-conan]
+config = ["tools.cmake.cmaketoolchain:generator=Ninja"]
+settings = ["compiler.cppstd=17"]
+
 [[tool.scikit-build-core-conan.local-recipes]]
 path = "third_party/funchook"
 version = "1.1.3"
 
-[[tool.scikit-build-core-conan.overrides]]
-if.platform-system = "win32"
-profile = ".github/conan_profiles/windows"
-
-[[tool.scikit-build-core-conan.overrides]]
-if.platform-system = "linux"
-profile = ".github/conan_profiles/linux"
-
 [tool.setuptools_scm]
 write_to = "python/src/endstone/_internal/version.py"
 version_scheme = "guess-next-dev"