Merge pull request #40 from nebulastream/use_smallfolly

[V31] Replace Folly with nesfolly
nebulastream · Apr 23, 2024 · 67acf5b · 67acf5b
2 parents 2e096d9 + 6a5d98e
commit 67acf5b
Show file tree

Hide file tree

Showing 20 changed files with 4,409 additions and 351 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,9 +14,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - osversion: ubuntu-18.04
-            arch: "x64"
-            force_system_binary: 0
           - osversion: ubuntu-20.04
             arch: "x64"
             force_system_binary: 0
@@ -50,27 +47,50 @@ jobs:
       - name: Build Docker
         id: builddocker
         working-directory: ${{ github.workspace }}/docker/
-        run: docker build  -t nes_dep_build_${{ matrix.osversion }} -f Dockerfile-${{ matrix.osversion }} .
+        run: |
+          docker build \
+            -t nes_dep_build_${{ matrix.osversion }} \
+            -f Dockerfile-${{ matrix.osversion }} \
+            .
       - name: Install vcpkg
         id: bootstrapvcpkg
         run: |
-          docker run -e ARCH=${{ matrix.arch }} -v ${{ github.workspace }}:/build_dir --rm nes_dep_build_${{ matrix.osversion }} /build_dir/vcpkg/bootstrap-vcpkg.sh -disableMetrics
+          docker run \
+            -u $(id -u ${USER}):$(id -g ${USER}) \
+            -e ARCH=${{ matrix.arch }} \
+            -v ${{ github.workspace }}:/build_dir \
+            --rm \
+            nes_dep_build_${{ matrix.osversion }} /build_dir/vcpkg/bootstrap-vcpkg.sh -disableMetrics
         shell: bash
       - name: Install dependencies in manifest mode
         id: installdeps
         run: |
-          docker run -e ARCH=${{ matrix.arch }} -v ${{ github.workspace }}:/build_dir --rm nes_dep_build_${{ matrix.osversion }}  \
-          /build_dir/vcpkg/vcpkg install --triplet=${{ env.VCPKG_DEP_LIST }}-nes \
-          --host-triplet=${{ env.VCPKG_DEP_LIST }}-nes --overlay-triplets=/build_dir/custom-triplets/ --x-manifest-root=/build_dir/ --overlay-ports=/build_dir/vcpkg-registry/ports
+          docker run \
+            -u $(id -u ${USER}):$(id -g ${USER}) \
+            -e ARCH=${{ matrix.arch }} \
+            -v ${{ github.workspace }}:/build_dir \
+            --rm \
+            nes_dep_build_${{ matrix.osversion }} /build_dir/vcpkg/vcpkg install \
+                --triplet=${{ env.VCPKG_DEP_LIST }}-nes \
+                --host-triplet=${{ env.VCPKG_DEP_LIST }}-nes \
+                --overlay-triplets=/build_dir/custom-triplets/ \
+                --x-manifest-root=/build_dir/ \
+                --overlay-ports=/build_dir/vcpkg-registry/ports
       - name: Compress artifacts
         id: compressdeps
         run: |
           mkdir nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes && \
-          mv ${{ github.workspace }}/vcpkg_installed nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/installed && \
+          mv \
+            ${{ github.workspace }}/vcpkg_installed \
+            nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/installed && \
           mkdir -p nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems && \
-          cp ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems/ && \
+          cp \
+            ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
+            ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems/ && \
           touch ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/.vcpkg-root && \
-          7z a nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes -mx9 -aoa
+          7z a -mx9 -aoa \
+            nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z \
+            nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes 
       - name: Release
         uses: softprops/action-gh-release@v1
         id: createrelease
@@ -164,4 +184,4 @@ jobs:
         run: |
           rm -rf nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes \
           nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z \
-          ${{ github.workspace }}/vcpkg/{buildtrees,downloads,packages}
+          ${{ github.workspace }}/vcpkg/{buildtrees,downloads,packages}
diff --git a/docker/Dockerfile-ubuntu-18.04 b/docker/Dockerfile-ubuntu-18.04
diff --git a/vcpkg-registry/ports/folly/FindLZ4.cmake b/vcpkg-registry/ports/folly/FindLZ4.cmake
diff --git a/vcpkg-registry/ports/folly/FindSnappy.cmake b/vcpkg-registry/ports/folly/FindSnappy.cmake
diff --git a/vcpkg-registry/ports/folly/boost-1.70.patch b/vcpkg-registry/ports/folly/boost-1.70.patch
diff --git a/vcpkg-registry/ports/folly/disable-non-underscore-posix-names.patch b/vcpkg-registry/ports/folly/disable-non-underscore-posix-names.patch
diff --git a/vcpkg-registry/ports/folly/fix-musl.patch b/vcpkg-registry/ports/folly/fix-musl.patch
diff --git a/vcpkg-registry/ports/folly/fix-windows-minmax.patch b/vcpkg-registry/ports/folly/fix-windows-minmax.patch
diff --git a/vcpkg-registry/ports/folly/portfile.cmake b/vcpkg-registry/ports/folly/portfile.cmake
diff --git a/vcpkg-registry/ports/folly/reorder-glog-gflags.patch b/vcpkg-registry/ports/folly/reorder-glog-gflags.patch