Merge pull request #39 from nebulastream/rocky-deps

Rocky deps
nebulastream · Jul 29, 2023 · 2e096d9 · 2e096d9
2 parents 2f6cbce + 52344bf
commit 2e096d9
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,6 +29,9 @@ jobs:
           - osversion: ubuntu-22.04
             arch: "arm64"
             force_system_binary: 1
+          - osversion: rocky-8.7
+            arch: "arm64"
+            force_system_binary: 1
     env:
       VCPKG_DEP_LIST: ${{ matrix.arch }}-linux
       VCPKG_FORCE_SYSTEM_BINARIES: ${{ matrix.force_system_binary }}
@@ -38,7 +41,7 @@ jobs:
         with:
           submodules: true
           fetch-depth: 0
-      - name: Checkout vcokg submodules
+      - name: Checkout vcpkg submodules
         working-directory: ${{ github.workspace }}/vcpkg/
         run: git fetch --unshallow || true
       - name: Set output vars to the actual tag name
@@ -51,13 +54,13 @@ jobs:
       - 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 -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 \
+          /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

diff --git a/docker/Dockerfile-rocky-8.7 b/docker/Dockerfile-rocky-8.7
@@ -0,0 +1,41 @@
+FROM rockylinux:8.7
+
+RUN dnf update -y && dnf install -y \
+  git \
+  wget \
+  python2 \
+  epel-release \
+  tar \
+  curl zip unzip tar \
+  pkg-config \
+  autoconf \
+  flex \
+  openssl-devel \
+  bison \
+  man-pages
+
+RUN dnf install -y \
+  p7zip \
+  p7zip-plugins\
+  python3 \
+  python3-virtualenv
+
+WORKDIR /tmp
+
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.0/cmake-3.21.0.tar.gz \
+    && tar -xzf cmake-3.21.0.tar.gz \
+    && cd cmake-3.21.0 \
+    && dnf -y install gcc-c++ make \
+    && ./bootstrap \
+    && make \
+    && make install
+
+WORKDIR /root
+
+RUN dnf --enablerepo=powertools -y install ninja-build
+
+RUN dnf groupinstall -y "Development Tools"
+
+ADD ./entrypoint-build.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/vcpkg-registry/ports/jemalloc-nes/portfile.cmake b/vcpkg-registry/ports/jemalloc-nes/portfile.cmake
@@ -13,7 +13,7 @@ vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}
 )
 
-list(APPEND OPTIONS --disable-stats)
+list(APPEND OPTIONS --disable-stats --disable-doc)
 if(VCPKG_TARGET_IS_OSX)
 	list(APPEND OPTIONS --with-lg-vaddr=48)
 endif()