Revert "Use a local port of re2 with a patch to work with cmake 3.29.1 (

G-Research#440)" This reverts commit 7994c97.
adamreeve · May 6, 2024 · 0d75561 · 0d75561
1 parent e25b38c
commit 0d75561
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 66 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -46,9 +46,8 @@ FROM cpp AS vcpkg
 
 USER vscode
 
-# Copy our vcpkg manifest and ports
+# Copy our vcpkg manifest
 COPY --chown=vscode:vscode vcpkg.json /tmp/build/
-COPY --chown=vscode:vscode ports /tmp/build/ports
 
 # Install vcpkg
 RUN sudo mkdir -p $VCPKG_ROOT \

diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,3 @@
 **
 !vcpkg.json
-!ports
-!*/*.csproj
+!*/*.csproj
diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml
@@ -9,7 +9,6 @@ on:
       - "vcpkg.json"
       - "*/*.csproj"
       - ".github/workflows/devcontainer.yml"
-      - "ports/**"
   pull_request:
     branches: [master]
     paths:
@@ -18,7 +17,6 @@ on:
       - "vcpkg.json"
       - "*/*.csproj"
       - ".github/workflows/devcontainer.yml"
-      - "ports/**"
   # Run once a week
   schedule:
     - cron: "34 2 * * 2"

diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake
diff --git a/ports/re2/remove_include_dir.patch b/ports/re2/remove_include_dir.patch
diff --git a/ports/re2/vcpkg.json b/ports/re2/vcpkg.json
diff --git a/vcpkg.json b/vcpkg.json
@@ -11,8 +11,5 @@
       "name": "arrow",
       "version": "16.0.0#1"
     }
-  ],
-  "vcpkg-configuration": {
-    "overlay-ports": ["./ports"]
-  }
+  ]
 }