diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index e0b0483b..f60defb9 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -63,7 +63,12 @@ jobs: - name: cxxlib shell: bash run: | - git describe --tags > src/git-tag.txt + if [[ "${GITHUB_REF}" == refs/tags/* ]]; then + version="${GITHUB_REF##*/}" + else + version="$(date '+%Y.%-m.%-d').dev${GITHUB_RUN_NUMBER}" + fi + echo "${version}" > src/git-tag.txt if [ "${{ matrix.docker_image }}" != "" ]; then export OCL_DOCKER_IMAGE="${{ matrix.docker_image }}" @@ -146,7 +151,12 @@ jobs: - name: nodejslib shell: bash run: | - git describe --tags > src/git-tag.txt + if [[ "${GITHUB_REF}" == refs/tags/* ]]; then + version="${GITHUB_REF##*/}" + else + version="$(date '+%Y.%-m.%-d')-dev.${GITHUB_RUN_NUMBER}" + fi + echo "${version}" > src/git-tag.txt if [ "${{ matrix.docker_image }}" != "" ]; then export OCL_DOCKER_IMAGE="${{ matrix.docker_image }}" @@ -262,7 +272,7 @@ jobs: version="$(date '+%Y.%-m.%-d').dev${GITHUB_RUN_NUMBER}" fi sed -i.bak "s/^version = .*/version = \"${version}\"/g" pyproject.toml && rm pyproject.toml.bak - git describe --tags > src/git-tag.txt + echo "${version}" > src/git-tag.txt - name: Set up QEMU uses: docker/setup-qemu-action@v2 if: matrix.architecture == 'aarch64' diff --git a/examples/cpp/test/test_example.cpp b/examples/cpp/test/test_example.cpp index 2da2beca..706c0da0 100644 --- a/examples/cpp/test/test_example.cpp +++ b/examples/cpp/test/test_example.cpp @@ -151,9 +151,9 @@ int main() std::vector cutters; cutters.push_back(&cylCutter); cutters.push_back(&ballCutter); - // cutters.push_back(&bullCutter); + cutters.push_back(&bullCutter); cutters.push_back(&coneCutter); - double z = 4; + double z = 0.5; double sampling = 0.1; for (auto cutter : cutters) { @@ -168,7 +168,7 @@ int main() } ocl::Path path = ocl::Path(); int i = 0; - for (double y = 0; y <= 0.3; y = y + 0.1) + for (double y = 0; y <= 0.2; y = y + 0.1) { bool ltr = ((int)i % 2) == 0; ocl::Point p1 = ocl::Point(ltr ? -2 : 11, y, 0); @@ -192,4 +192,4 @@ int main() } return 0; -} +} \ No newline at end of file