RSDK-13622: Add lockfile to corresponding release (#608)

Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com>
Co-authored-by: Alexi Maschas <alexi.maschas@viam.com>

Author: 3 people

.github/workflows/conan-publish.yml

@@ -12,11 +12,11 @@ on:
         type: boolean
         default: false
         description: If true, publish slow-building deps as well
-      lockfile_sdk_update:
+      lockfile_release_update:
         required: true
         type: boolean
-        default: true
-        description: If true, update the SDK version in the lockfile
+        default: false
+        description: If true, add a conan.lock artifact to the draft release
 
 
 jobs:
@@ -50,7 +50,7 @@ jobs:
           conan remote auth --force -cc core:non_interactive=True viamconan
 
       - name: Set lockfile update arguments
-        if: inputs.lockfile_sdk_update
+        if: inputs.lockfile_release_update
         run: echo "LOCKFILE_UPDATE_ARGS=--lockfile-out conan.lock --lockfile-clean" >> $GITHUB_ENV
 
       - name: Create and upload package
@@ -62,13 +62,15 @@ jobs:
           # more details.
           export BUF_CONFIG_DIR=$(mktemp -d)
 
+          conan lock add --requires=viam-cpp-sdk/${{ inputs.ref }}
+
           conan create . --build=missing -s:a compiler.cppstd=17 -o:a "&:shared=False" \
           --lockfile etc/conan/conan.lock $LOCKFILE_UPDATE_ARGS
 
           conan upload "viam-cpp-sdk/*" -r viamconan -c
 
       - name: Upload lockfile artifact
-        if: inputs.lockfile_sdk_update
+        if: inputs.lockfile_release_update
         uses: actions/upload-artifact@v4
         with:
           name: conan-lockfile-macos-latest
@@ -156,20 +158,22 @@ jobs:
         conan remote auth --force -cc core:non_interactive=True viamconan
 
     - name: Set lockfile update arguments
-      if: inputs.lockfile_sdk_update
+      if: inputs.lockfile_release_update
       run: echo "LOCKFILE_UPDATE_ARGS=--lockfile-out conan.lock --lockfile-clean" >> $GITHUB_ENV
 
     - name: Create and upload package
       run: |
         . ./conan_venv/bin/activate
 
+        conan lock add --requires=viam-cpp-sdk/${{ inputs.ref }}
+
         conan create . --build=missing -s:a compiler.cppstd=17 -o:a "&:shared=False" \
         --lockfile etc/conan/conan.lock $LOCKFILE_UPDATE_ARGS
 
         conan upload "viam-cpp-sdk/*" -r viamconan -c
 
     - name: Sanitize image name for artifact
-      if: inputs.lockfile_sdk_update
+      if: inputs.lockfile_release_update
       shell: bash
       env:
         IMAGE_NAME: "${{ matrix.image }}"
@@ -179,14 +183,13 @@ jobs:
         echo IMAGE_NAME=${IMAGE_NAME} >> $GITHUB_ENV
 
     - name: Upload lockfile artifact
-      if: inputs.lockfile_sdk_update
+      if: inputs.lockfile_release_update
       uses: actions/upload-artifact@v4
       with:
         name: conan-lockfile-${{ matrix.runner }}-${{ env.IMAGE_NAME }}
         path: conan.lock
 
     - name: Upload additional deps
-      if: inputs.upload_deps && !(matrix.runner == 'ubuntu-large' && matrix.image == 'ubuntu:22.04')
       run: |
         . ./conan_venv/bin/activate
 
@@ -258,7 +261,7 @@ jobs:
 
   merge_lockfiles:
     needs: [build_macos, build_linux]
-    if: inputs.lockfile_sdk_update
+    if: inputs.lockfile_release_update
     runs-on: ubuntu-latest
 
     steps:
@@ -289,19 +292,10 @@ jobs:
           conan lock merge $LOCKFILE_ARGS
           cat conan.lock
 
-          # Move merged lockfile to repository
-          mv conan.lock ../etc/conan/conan.lock
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+      - name: Upload merged lockfile to release
+        uses: softprops/action-gh-release@v1
         with:
-          commit-message: '[WORKFLOW] Update conan lockfile for SDK version ${{ inputs.ref }}'
-          branch: 'workflow/update-lockfile'
-          base: main
-          add-paths: etc/conan/conan.lock
-          delete-branch: true
-          title: Automated Lockfile Update for v${{ inputs.ref }}
-          body: This is an auto-generated PR to update the conan lockfile after publishing SDK version ${{ inputs.ref }}
-          token: ${{ secrets.GIT_ACCESS_TOKEN }}
-
-
+          tag_name: releases/v${{ inputs.ref }}
+          files: lockfiles/conan.lock
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -53,7 +53,10 @@ jobs:
           ref: ${{ needs.prepare.outputs.sha }}
 
       - name: Install dependencies
-        run: choco install -y conan git
+        shell: powershell
+        run: |
+          choco install -y conan git
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
       - name: Create package
         shell: powershell
@@ -299,7 +302,7 @@ jobs:
           path: builds/viam-cpp-sdk-${{ matrix.platform }}.tar.gz
 
   release:
-    needs: [prepare, build_macos, build_linux_debian, build_linux_ubuntu_jammy]
+    needs: [prepare, build_windows, build_macos, build_linux_debian, build_linux_ubuntu_jammy]
     if: github.repository_owner == 'viamrobotics'
     runs-on: ubuntu-latest
 

etc/conan/conan.lock

@@ -5,7 +5,6 @@
         "xtl/0.8.0#45f1f2f2e5cbff154b59a57dbd6efb55%1747056138.62",
         "xtensor/0.26.0#929fed688e0b3e850106059bf3782e81%1755248340.339",
         "xsimd/13.2.0#b4819b06b51041b1cd32114700adbb59%1743412135.667",
-        "viam-cpp-sdk/0.33.1#b971157efae4557aa5a54c00e676a925%1774447979.2026496",
         "re2/20230301#3d3c2b323893c0cb89b55d0c3b281724%1764857321.217",
         "protobuf/5.27.0#99c5d5f87d1eea580a2234238020821b%1768401326.052",
         "openssl/3.6.1#2e0be4a996c7ca91feb31b7fe65117b9%1769599203.736",