diff --git a/.circleci/config.yml b/.circleci/config.yml index 3be8a8de82..16e95ad40f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -87,7 +87,6 @@ jobs: export OPENSCAD_VERSION="$(date +%Y.%m.%d).ai${CIRCLE_BUILD_NUM}" if [ x"${CIRCLE_BRANCH}" = xmaster ]; then export SUFFIX=""; else export SUFFIX="_$(echo ${CIRCLE_BRANCH} | sed -e 's,pull/,PR,')"; fi git submodule update --init --recursive - ( cd submodules/manifold && git apply thrust.diff ) mkdir build && cd build cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DEXPERIMENTAL=ON -DSNAPSHOT=ON -DOPENSCAD_VERSION="$OPENSCAD_VERSION" -DOPENSCAD_COMMIT="$OPENSCAD_COMMIT" make -j4 @@ -126,7 +125,6 @@ jobs: if [ x"${CIRCLE_BRANCH}" = xmaster ]; then export SUFFIX=""; else export SUFFIX="_$(echo ${CIRCLE_BRANCH} | sed -e 's,pull/,PR,')"; fi export PKG_CONFIG_PATH="/emsdk/upstream/emscripten/cache/sysroot/lib/pkgconfig" git submodule update --init --recursive - ( cd submodules/manifold && git apply thrust.diff ) emcmake cmake -B ../build . \ -DWASM=ON \ -DSNAPSHOT=ON \ @@ -173,7 +171,6 @@ jobs: steps: - checkout - run: git submodule update --init --recursive - - run: ( cd submodules/manifold && git apply thrust.diff ) - run: name: System Info command: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b95e635910..6287e7f650 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,9 +38,6 @@ jobs: - name: Submodules run: git submodule update --init --recursive - - name: Manifold patches - run: ( cd submodules/manifold && git apply thrust.diff ) - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 476f9646b0..3ab44ebc8d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -29,8 +29,6 @@ jobs: uses: actions/checkout@v3 - name: Submodules run: git submodule update --init --recursive - - name: Manifold patches - run: ( cd submodules/manifold && git apply thrust.diff ) - name: Install dependencies run: ./scripts/travis-ci-before-install-linux.sh ${{ matrix.distro }} - name: Dependency fixup diff --git a/README.md b/README.md index 1ad4a2925b..a5775777eb 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,6 @@ To pull the various submodules (incl. the [MCAD library](https://github.com/open cd openscad git submodule update --init --recursive - ( cd submodules/manifold && git apply thrust.diff ) ### Building for macOS diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh index ee5514e5b0..8be7cfa73a 100755 --- a/scripts/docker-build.sh +++ b/scripts/docker-build.sh @@ -7,9 +7,7 @@ test -d openscad || git clone --depth=50 --branch=master https://github.com/openscad/openscad.git openscad ( cd openscad; \ - git submodule update --init --recursive; \ - cd submodules/manifold; \ - git apply thrust.diff ) + git submodule update --init --recursive; ) mkdir -p docker cat <<'EOF'> docker/Dockerfile diff --git a/scripts/release-common.sh b/scripts/release-common.sh index 98f25d3068..9c3503d27d 100755 --- a/scripts/release-common.sh +++ b/scripts/release-common.sh @@ -170,7 +170,6 @@ esac echo "Checking pre-requisites..." git submodule update --init --recursive -( cd submodules/manifold ; git apply thrust.diff || true ) echo "Building openscad-$VERSION ($VERSIONDATE)" echo " CMake args: $CMAKE_CONFIG" diff --git a/submodules/manifold b/submodules/manifold index 112f9ba501..97317888bc 160000 --- a/submodules/manifold +++ b/submodules/manifold @@ -1 +1 @@ -Subproject commit 112f9ba50122c6e23d519968c3a12bd9d7714fd2 +Subproject commit 97317888bcc5e5506f1571530f58b9b3e468dbb0