hard pin sofa in sofa-python3 recipe to prevent inconsistent timing in repo indexing

Author: olivier-roussel

.github/workflows/build_publish_package.yml

@@ -33,6 +33,9 @@ on:
       git-commit-date:
         required: false
         type: string
+      sofa-git-sha:
+        required: false
+        type: string
     secrets:
       api-key:
         required: true
@@ -117,7 +120,7 @@ jobs:
         cd conda/recipes/${{ inputs.recipe-dir }}/${{ inputs.package-name }}/recipe
         # if a git SHA1 has been provided, use it
         if [[ ! -z "${{ inputs.git-sha }}" && ! -z "${{ inputs.git-commit-date }}" ]]; then
-          sed -e "s/%GIT_SHA%/${{ inputs.git-sha }}/g" -e "s/%DATE_YYYYMMDD%/${{ inputs.git-commit-date }}/g" recipe.yaml.in > recipe.yaml
+          sed -e "s/%GIT_SHA%/${{ inputs.git-sha }}/g" -e "s/%DATE_YYYYMMDD%/${{ inputs.git-commit-date }}/g" -e "s/%GIT_SHA%/${{ inputs.sofa-git-sha }}/g" recipe.yaml.in > recipe.yaml
         fi
         # Show configured recipe
         echo "==== Configured recipe:"

.github/workflows/devel-sofa-all.yml

@@ -91,7 +91,8 @@ jobs:
     if: ${{ needs.build-publish-sofa.result == 'success' }}
     with:
       git-sha: ${{ needs.extract-params.outputs.sofa-python3-git-sha }}
-      git-commit-date: ${{ needs.extract-params.outputs.sofa-python3-git-commit-date }}    
+      git-commit-date: ${{ needs.extract-params.outputs.sofa-python3-git-commit-date }}
+      sofa-git-sha: ${{ needs.extract-params.outputs.sofa-git-sha }}
     secrets: inherit
 
   notify-end:

.github/workflows/devel-sofa-python3.yml

@@ -10,6 +10,10 @@ on:
         description: 'Git commit date'
         required: true
         type: string
+      sofa-git-sha:
+        description: 'SOFA Git commit SHA1'
+        required: true
+        type: string
   workflow_dispatch:
    inputs:
       git-sha:
@@ -21,7 +25,11 @@ on:
         description: 'Git commit date'
         required: true
         type: string
-        default: 'NODATE' # for testing  
+        default: 'NODATE' # for testing
+      sofa-git-sha:
+        description: 'SOFA Git commit SHA1'
+        required: true
+        type: string
   repository_dispatch:
     types: [build-devel-sofa-python3]
   pull_request:
@@ -64,15 +72,18 @@ jobs:
           if [[ "${{ github.event_name }}" == "workflow_dispatch" || "${{ github.event_name }}" == "workflow_call" ]]; then
             echo "git-sha=${{ inputs.git-sha }}" >> $GITHUB_OUTPUT
             echo "git-commit-date=${{ inputs.git-commit-date }}" >> $GITHUB_OUTPUT
+            echo "sofa-git-sha=${{ inputs.sofa-git-sha }}" >> $GITHUB_OUTPUT
           elif [[ "${{ github.event_name }}" == "repository_dispatch" ]]; then
             echo "git-sha=${{ github.event.client_payload.sofa_python3_commit_hash }}" >> $GITHUB_OUTPUT
             echo "git-commit-date=${{ github.event.client_payload.sofa_python3_commit_date }}" >> $GITHUB_OUTPUT
+            echo "sofa-git-sha=${{ github.event.client_payload.sofa_commit_hash }}" >> $GITHUB_OUTPUT
           fi
 
       - name: Check parameters
         run: |
           echo "✓ git-sha: ${{ steps.params.outputs.git-sha }}"
           echo "✓ git-commit-date: ${{ steps.params.outputs.git-commit-date }}"
+          echo "✓ sofa-git-sha: ${{ steps.params.outputs.sofa-git-sha }}"
 
   build-publish-sofa-python3:
     strategy:
@@ -99,5 +110,6 @@ jobs:
       publish-package: ${{ (github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true) ||  github.event_name == 'workflow_dispatch' ||  github.event_name == 'workflow_call' ||  github.event_name == 'repository_dispatch' }}
       git-sha: ${{ needs.extract-params.outputs.git-sha }}
       git-commit-date: ${{ needs.extract-params.outputs.git-commit-date }}
+      sofa-git-sha: ${{ needs.extract-params.outputs.sofa-git-sha }}
     secrets:
       api-key: ${{ secrets.PREFIXDEV_APIKEY }}

conda/recipes/devel/sofa-python3/recipe/recipe.yaml.in

@@ -6,6 +6,7 @@ context:
   minor: ${{ (version | split('.'))[1] }}
   major_minor: ${{ major }}.${{ minor }}
   git_sha: %GIT_SHA%
+  sofa_git_sha: %SOFA_GIT_SHA%
 
 package:
   name: ${{ name }}
@@ -47,8 +48,8 @@ requirements:
         - numpy
         - pybind11
   host:
-    - sofa-devel ${{ major_minor }}.dev*
-    - sofa-gl ${{ major_minor }}.dev*
+    - sofa-devel ${{ major_minor }}.dev* dev_${{ sofa_git_sha[:7] }}
+    - sofa-gl ${{ major_minor }}.dev* dev_${{ sofa_git_sha[:7] }}
     - eigen
     - libboost-headers
     - glew
@@ -57,8 +58,8 @@ requirements:
     - numpy
     - pybind11
   run:
-    - sofa-devel ${{ major_minor }}.dev*
-    - sofa-gl ${{ major_minor }}.dev*
+    - sofa-devel ${{ major_minor }}.dev* dev_${{ sofa_git_sha[:7] }}
+    - sofa-gl ${{ major_minor }}.dev* dev_${{ sofa_git_sha[:7] }}
     - ${{ pin_compatible('numpy') }}
     - python
   run_exports: