Use CONDA_BUILD_YML instead of PYTHON_VERSION.

Quantco · May 1, 2021 · d7d0c23 · d7d0c23
1 parent eae7ee4
commit d7d0c23
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/.github/actions/conda-build/action.yml b/.github/actions/conda-build/action.yml
@@ -2,7 +2,7 @@ name: Run image
 description: Run private container from GitHub Packages Registry after Docker login
 inputs:
   conda_build_yml:
-    description: 'conda-build variant file'
+    description: "conda-build variant file"
     required: true
 runs:
   using: 'docker'

diff --git a/.github/actions/deployment/action.yml b/.github/actions/deployment/action.yml
@@ -1,11 +1,8 @@
 name: Run CD inside of container
 description: Deploy package from the private container from GitHub Packages Registry after Docker login
 inputs:
-  python_version:
-    description: 'Python version'
-    required: true
-  glm_architecture:
-    description: 'GLM architecture'
+  conda_build_yml:
+    description: "conda-build variant file"
     required: true
 runs:
   using: 'docker'
@@ -14,4 +11,4 @@ runs:
    - /bin/bash
    - "-l"
    - "-c"
-   - "./.github/workflows/tag.sh ${{ inputs.python_version }} ${{ inputs.glm_architecture }}"
+   - "./.github/workflows/tag.sh ${{ inputs.conda_build_yml }}"
diff --git a/.github/workflows/macos-tag.sh b/.github/workflows/macos-tag.sh
@@ -2,7 +2,11 @@
 
 set -exo pipefail
 
-mamba install -y conda-build conda-channel-client
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source ${SCRIPT_DIR}/macos-conda-build.sh $*
 
-conda build --python ${PYTHON_VERSION} --variants "{GLM_ARCHITECTURE: ['${GLM_ARCHITECTURE}']}" conda.recipe
-upload-conda-package $(conda render --python ${PYTHON_VERSION} --variants "{GLM_ARCHITECTURE: ['${GLM_ARCHITECTURE}']}" --output conda.recipe)
+mamba install -y conda-channel-client
+
+if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+  upload-conda-package $(conda render -m .ci_support/${CONDA_BUILD_YML}.yaml --output conda.recipe)
+fi
diff --git a/.github/workflows/tag.sh b/.github/workflows/tag.sh
@@ -5,8 +5,10 @@ set -eo pipefail
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source ${SCRIPT_DIR}/base.sh $*
 
-export GLM_ARCHITECTURE=$2
+export CONDA_BUILD_YML=$1
 
 conda activate base
-conda build --python ${PYTHON_VERSION} --variants "{GLM_ARCHITECTURE: ['${GLM_ARCHITECTURE}']}" conda.recipe
-upload-conda-package $(conda render --python ${PYTHON_VERSION} --variants "{GLM_ARCHITECTURE: ['${GLM_ARCHITECTURE}']}" --output conda.recipe)
+conda build -m .ci_support/${CONDA_BUILD_YML}.yaml conda.recipe
+if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+  upload-conda-package $(conda render -m .ci_support/${CONDA_BUILD_YML}.yaml --output conda.recipe)
+fi
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -12,6 +12,7 @@ jobs:
       CI: True
       ***REMOVED***: ${{ secrets.***REMOVED*** }}
       ***REMOVED***: ${{ secrets.***REMOVED*** }}
+      CONDA_BUILD_YML: "${{ matrix.CONDA_BUILD_YML }}"
     strategy:
       fail-fast: false
       matrix:
@@ -41,7 +42,6 @@ jobs:
         uses: ./.github/actions/deployment
         with:
           conda_build_yml: ${{ matrix.CONDA_BUILD_YML }}
-          python_version: ${{ matrix.PYTHON_VERSION }}
 
   macos-deployment:
     name: "MacOS - deployment - Python ${{ matrix.PYTHON_VERSION }} - ${{ matrix.GLM_ARCHITECTURE }}"
@@ -123,4 +123,4 @@ jobs:
           mamba install -n base -y conda-build
           conda build -m .ci_support/${{ matrix.CONDA_BUILD_YML}}.yaml conda.recipe
           mamba install -y conda-channel-client
-          upload-conda-package (conda render -m .ci_support/${{ matrix.CONDA_BUILD_YML }}.yaml --output conda.recipe)
+          python -m conda_channel_client (conda render -m .ci_support/${{ matrix.CONDA_BUILD_YML }}.yaml --output conda.recipe)