Merge pull request #21 from LyceanEM/Build-Testing

Build testing has identified the source of failure to build for the windows packaging

Author: LyceanEM

.github/workflows/conda_build.yaml

@@ -4,9 +4,13 @@ name: Build
 on:
   workflow_dispatch:
   push:
-    branches: [ master,Development,Documentation-Updates ]
+    branches:
+      - master
+      - '**'
   pull_request:
-    branches: [ master,Development,Documentation-Updates ]
+    branches:
+      - master
+      - '**'
 
 jobs:
   build:
@@ -36,6 +40,7 @@ jobs:
     defaults:
       run:
         shell: ${{ matrix.platform.shell }}
+
     env:
       REPO: "${{ github.event.pull_request.head.repo.full_name || github.repository }}"
     steps:
@@ -45,7 +50,23 @@ jobs:
           python-version: ${{ matrix.python-version }}
           activate-environment: build_env
           miniforge-version: latest
-#
+
+#      - name: set_label
+#        id: set_label
+#        run: |
+#          BRANCH_NAME=$(echo ${{ github.ref }} | sed 's/refs\/heads\///')
+#          CONDA_LABEL=""
+#          if [ "$BRANCH_NAME" == "master" ]; then
+#            CONDA_LABEL="main"
+#          else
+#            CONDA_LABEL="dev-${BRANCH_NAME}"
+#          fi
+#          echo "CONDA_LABEL=$CONDA_LABEL" >> $GITHUB_ENV
+      - name: Extract branch name
+        shell: bash
+        run: echo "CONDA_LABEL=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV
+        id: extract_branch
+
       - name: Clone the devel branch (push to devel)
         run:  git clone --branch ${{ github.head_ref || github.ref_name }} https://github.com/${{ env.REPO }}
         if: github.event_name != 'pull_request'
@@ -68,4 +89,5 @@ jobs:
         env:
 
           ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
+          label: ${{ env.CONDA_LABEL }}
         if: github.event_name != 'pull_request'

actions/upload.py

@@ -2,8 +2,9 @@
 import os
 import sys
 from pathlib import Path
+
 script = os.path.abspath(sys.argv[0])
-script_path=Path(script)
+script_path = Path(script)
 # go up one directories to get the source directory
 # (this script is in Sire/actions/)
 srcdir = os.path.dirname(os.path.dirname(script))
@@ -50,28 +51,32 @@ def run_cmd(cmd):
 gitdir = os.path.join(srcdir, ".git")
 
 tag = run_cmd(f"git --git-dir={gitdir} --work-tree={srcdir} tag --contains")
-branch = run_cmd(f"git --git-dir={gitdir} branch --show-current")
+# branch = run_cmd(f"git --git-dir={gitdir} branch --show-current")
 # if the branch is master, then this is a main release
-#if tag is not None and tag.lstrip().rstrip() != "":
+# if tag is not None and tag.lstrip().rstrip() != "":
 #    print(f"\nTag {tag} is set. This is a 'main' release.")
 #    label = "--label main"
-#else:
+# else:
 #    # this is a development release
 #    print("\nNo tag is set. This is a 'devel' release.")
 #    label = "--label dev"
-print("branch is " , branch)
-if branch=="master":
-    print(f"\nBranch {branch} is set. This is a 'main' release.")
+
+# Get the label
+if "CONDA_LABEL" in os.environ:
+    branch_label = os.environ["CONDA_LABEL"]
+else:
+    branch_label = "TEST"
+print("branch is ", branch_label)
+if branch_label == "master":
+    print(f"\nBranch {branch_label} is set. This is a 'main' release.")
     label = "--label main"
 else:
     # this is a development release
-    print(f"\nBranch {branch} is set. This is a 'devel' release.")
-    label = "--label dev"
+    print(f"\nBranch {branch_label} is set. This is a 'devel' release.")
+#    label = "--label dev"
 
 # Upload the packages to the michellab channel on Anaconda Cloud.
-cmd = (
-    f"anaconda --token {conda_token} upload --user LyceanEM {label} --force {packages}"
-)
+cmd = f"anaconda --token {conda_token} upload --user LyceanEM --label {branch_label} --force {packages}"
 
 print(f"\nUpload command:\n\n{cmd}\n")
 

conda/meta.yaml

@@ -36,8 +36,7 @@ requirements:
   - conda-forge::ninja
   - conda-forge::scikit-build
   - nvidia::cuda-nvcc
-
-  - conda-forge::cxx-compiler
+  - {{ compiler('cxx') }}
 
   # NVIDIA components to build CUDA code (no full runtime)
   - nvidia::cuda-nvcc