revert env -> outputs change

mongodb-labs · Jun 26, 2024 · b1e4e6f · b1e4e6f
1 parent c3c7739
commit b1e4e6f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/node/generate_release.mjs b/node/generate_release.mjs
@@ -32,7 +32,7 @@ const generated = template
   .replaceAll("RELEASE_TAG", tag)
   .replaceAll("EVERGREEN_PROJECT", EVERGREEN_PROJECTS[npmPackage] ?? "")
   .replaceAll("IGNORE_INSTALL_SCRIPTS", isNative)
-  .replaceAll("SILK_ASSET_GROUP", assetGroup ?? "''");
+  .replaceAll("SILK_ASSET_GROUP", assetGroup ? `'${assetGroup}'` : "''");
 
 const project = EVERGREEN_PROJECTS[npmPackage];
 if (!project) {

diff --git a/node/get_version_info/action.yml b/node/get_version_info/action.yml
@@ -5,14 +5,25 @@ inputs:
     description: the npm package name
     required: true
 
+outputs:
+  package_version:
+    description: "the package version"
+    value: ${{ steps.get_version_info.outputs.package_version }}
+  package_file:
+    description: "the package_file"
+    value: ${{ steps.get_version_info.outputs.package_file }}
+  commit:
+    description: "the commit"
+    value: ${{ steps.get_version_info.outputs.commit }}
+
 runs:
   using: composite
   steps:
     - name: Get release version and release package file name
-      id: get_version
+      id: get_version_info
       shell: bash
       run: |
         package_version=$(jq --raw-output '.version' package.json)
-        echo "package_version=${package_version}" >> "$GITHUB_ENV"
-        echo "package_file=${{ inputs.npm_package_name }}-${package_version}.tgz" >> "$GITHUB_ENV"
-        echo "commit=$(git rev-parse HEAD)" >> $GITHUB_ENV
+        echo "package_version=${package_version}" >> "$GITHUB_OUTPUT"
+        echo "package_file=${{ inputs.npm_package_name }}-${package_version}.tgz" >> "$GITHUB_OUTPUT"
+        echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
diff --git a/node/release_template.yml b/node/release_template.yml
@@ -59,12 +59,12 @@ jobs:
 
       - name: Copy sbom file to release assets
         shell: bash
-        if: ${{ 'SILK_ASSET_GROUP' == '' }}
+        if: ${{ SILK_ASSET_GROUP == '' }}
         run: cp sbom.json ${{ env.S3_ASSETS }}/sbom.json
 
       # only used for mongodb-client-encryption
       - name: Augment SBOM and copy to release assets
-        if: ${{ 'SILK_ASSET_GROUP' != '' }}
+        if: ${{ SILK_ASSET_GROUP != '' }}
         uses: mongodb-labs/drivers-github-tools/sbom@v2
         with:
           silk_asset_group: SILK_ASSET_GROUP