From 91d2e5ccd14cfb2a34de6c911344b4c10df4509b Mon Sep 17 00:00:00 2001
From: krande <kristoffer_andersen@outlook.com>
Date: Thu, 23 Nov 2023 14:58:34 +0100
Subject: [PATCH] add novtk/all variants to daily builds

---
 .github/workflows/ci-ifcopenshell-conda-daily.yml |  9 +++------
 conda/Makefile                                    |  8 --------
 conda/conda_build_config.yaml                     |  6 +++++-
 conda/environment.yml                             | 13 -------------
 conda/meta.yaml                                   | 13 ++++++++++---
 5 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 conda/Makefile
 delete mode 100644 conda/environment.yml

diff --git a/.github/workflows/ci-ifcopenshell-conda-daily.yml b/.github/workflows/ci-ifcopenshell-conda-daily.yml
index c5905afa75..7f124193b5 100644
--- a/.github/workflows/ci-ifcopenshell-conda-daily.yml
+++ b/.github/workflows/ci-ifcopenshell-conda-daily.yml
@@ -42,6 +42,7 @@ jobs:
           { name: Linux, distver: ubuntu-22.04,  upload: 'true' },
           { name: macOS, distver: macos-12, upload: 'true' }
         ]
+        variant: ['novtk', 'all']
     steps:
       - uses: actions/checkout@v3
         with:
@@ -61,13 +62,9 @@ jobs:
             channel_priority: strict
           create-args: >-
             python=${{ matrix.pyver.distver }}
+
       - name: build, test and upload ifcopenshell
         if: ${{ matrix.platform.upload == 'true' }}
         run: |
-          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
-        working-directory: ./conda
-      - name: build & test ifcopenshell
-        if: ${{ matrix.platform.upload == 'false' }}
-        run: |
-          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell --variants "{variant: ${{ matrix.variant }}}"
         working-directory: ./conda
diff --git a/conda/Makefile b/conda/Makefile
deleted file mode 100644
index c4cb211f1f..0000000000
--- a/conda/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-compile:
-	conda activate conda-build && conda-build -c conda-forge . --keep-old-work --python 3.10.5
-
-debug:
-	conda activate conda-build && conda-debug -c conda-forge . --python 3.10.4
-
-env:
-	conda env update --f environment.yml --prune
\ No newline at end of file
diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml
index 5a72b972fe..00c18acf5e 100644
--- a/conda/conda_build_config.yaml
+++ b/conda/conda_build_config.yaml
@@ -1,2 +1,6 @@
 CONDA_BUILD_SYSROOT:
-  - /opt/MacOSX10.13.sdk       # [osx]
\ No newline at end of file
+  - /opt/MacOSX10.13.sdk       # [osx]
+
+variant:
+  - novtk
+  - all
\ No newline at end of file
diff --git a/conda/environment.yml b/conda/environment.yml
deleted file mode 100644
index 863f45f4fb..0000000000
--- a/conda/environment.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: conda-build
-channels:
-  - conda-forge
-dependencies:
-  - conda-build
-  - conda-verify
-  - anaconda-client
-  - ninja
-  - doxygen
-  - ripgrep
-  - pip
-  - pip:
-      - lief==0.13
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 5afdd5a56c..8b3448b805 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -1,6 +1,10 @@
 {% set name = "ifcopenshell" %}
 {% set version = "0.7.0" %}
+{% set build = 1 %}
 
+# Higher number -> Always prioritize "novtk" variant over "all" variant
+{% set build = build + 200 %}   # [variant == "novtk"]
+{% set build = build + 100 %}   # [variant == "all"]
 
 package:
   name: {{ name }}
@@ -10,8 +14,9 @@ source:
   path: ..
 
 build:
+  string: {{ variant }}_h{{ PKG_HASH }}_{{ build }}
   binary_relocation: false [osx]
-  number: 1
+  number: {{ build }}
 
 requirements:
   build:
@@ -24,7 +29,7 @@ requirements:
   host:
     - python
     - boost-cpp
-    - occt ==7.7.0
+    - occt 7.7.2 *{{ variant }}*
     - libxml2
     - cgal-cpp
     - hdf5
@@ -36,7 +41,7 @@ requirements:
 
   run:
     - python
-    - {{ pin_compatible('occt', max_pin='x.x.x') }}
+    - occt 7.7.2 *{{ variant }}*
     - {{ pin_compatible('cgal-cpp', max_pin='x.x.x') }}
     - {{ pin_compatible('boost-cpp', max_pin='x.x.x') }}
     - libxml2
@@ -46,6 +51,8 @@ requirements:
     - mpir  # [win]
     - nlohmann_json
     - zlib
+  run_constrained:
+    - occt 7.7.2 *{{ variant }}*
 
 test:
   imports: