Skip to content

Commit

Permalink
Merge pull request openscad#4067 from thehans/malloc
Browse files Browse the repository at this point in the history
Use cmake for install and packaging with Windows.  
Also package tests with Windows .zip archives, with various fixes for running outside of build environment.
  • Loading branch information
thehans authored Dec 31, 2022
2 parents 1ffaeec + 3f02fab commit 0788d61
Show file tree
Hide file tree
Showing 24 changed files with 354 additions and 862 deletions.
6 changes: 4 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ jobs:
no_output_timeout: 18000
command: |
export NUMCPU=4
export LC_ALL=C.UTF-8
export MXEDIR=/mxe
export LIB3MF_INCLUDEDIR=/mxe/usr/i686-w64-mingw32.static.posix/include/lib3mf
export LIB3MF_LIBDIR=/mxe/usr/i686-w64-mingw32.static.posix/lib
if [ x"${CIRCLE_BRANCH}" = xmaster ]; then export SUFFIX=""; else export SUFFIX="_$(echo ${CIRCLE_BRANCH} | sed -e 's,pull/,PR,')"; fi
export OPENSCAD_VERSION="$(date +%Y.%m.%d).ci${CIRCLE_BUILD_NUM}"
./scripts/release-common.sh -snapshot -mingw32 -v "$OPENSCAD_VERSION"
./scripts/release-common.sh snapshot mingw32 -v "$OPENSCAD_VERSION"
mkdir -p /tmp/out
for f in mingw*/*.zip mingw*/*.exe; do N=$(basename "$f" | sed -e "s/\\(-x86-[36][24]\\)/\\1${SUFFIX}/;"); cp -iv "$f" /tmp/out/"$N"; done
if [ -n "${CODE_SIGNING_KEY}" ]; then
Expand All @@ -44,13 +45,14 @@ jobs:
no_output_timeout: 18000
command: |
export NUMCPU=4
export LC_ALL=C.UTF-8
export MXEDIR=/mxe
export LIB3MF_INCLUDEDIR=/mxe/usr/x86_64-w64-mingw32.static.posix/include/lib3mf
export LIB3MF_LIBDIR=/mxe/usr/x86_64-w64-mingw32.static.posix/lib
if [ x"${CIRCLE_BRANCH}" = xmaster ]; then export SUFFIX=""; else export SUFFIX="_$(echo ${CIRCLE_BRANCH} | sed -e 's,pull/,PR,')"; fi
export OPENSCAD_VERSION="$(date +%Y.%m.%d).ci${CIRCLE_BUILD_NUM}"
./scripts/release-common.sh -snapshot -mingw64 -v "$OPENSCAD_VERSION"
./scripts/release-common.sh snapshot mingw64 -v "$OPENSCAD_VERSION"
mkdir -p /tmp/out
for f in mingw*/*.zip mingw*/*.exe; do N=$(basename "$f" | sed -e "s/\\(-x86-[36][24]\\)/\\1${SUFFIX}/;"); cp -iv "$f" /tmp/out/"$N"; done
if [ -n "${CODE_SIGNING_KEY}" ]; then
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: |
cd build/tests
export NUMCPU=$(($(sysctl -n hw.ncpu) * 3 / 2))
ctest -j$NUMCPU -E 'edges_view-options-tests|nef3_broken'
ctest -j$NUMCPU
- name: Upload Test Result Report
uses: actions/upload-artifact@v3
if: ${{ always() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
run: |
cd build
cd tests
ctest -j2 -E 'opencsgtest_issue1165|opencsgtest_issue1215|throwntogethertest_issue1089|throwntogethertest_issue1215|openscad-nonascii|import_3mf|3mfpngtest|3mfexport|pdfexporttest_centered'
ctest -j2
- name: Upload Test Result Report
uses: actions/upload-artifact@v3
if: ${{ always() }}
Expand Down
153 changes: 0 additions & 153 deletions .travis.yml

This file was deleted.

Loading

0 comments on commit 0788d61

Please sign in to comment.