wip

radical · Aug 21, 2023 · 2262809 · 2262809
1 parent 01bdd3a
commit 2262809
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/bump-chrome-version.yml b/.github/workflows/bump-chrome-version.yml
@@ -51,13 +51,13 @@ jobs:
         with:
           script: |
             const { CHROME_LINUX_VER, CHROME_WIN_VER } = process.env;
-            const title=`[wasm] Bump chrome for testing - linux: ${CHROME_LINUX_VER}, windows: ${CHROME_WIN_VER}`;
+            const title = `[wasm] Bump chrome for testing - linux: ${CHROME_LINUX_VER}, windows: ${CHROME_WIN_VER}`;
             const { data: pullRequest } = await github.rest.pulls.create({
               base: context.ref,
               head: "update-chrome-version-${{ github.run_id }}",
               owner: context.repo.owner,
               repo: context.repo.repo,
-              title: $title,
+              title: title,
               body: ''
             });
             await github.rest.issues.setLabels({

diff --git a/eng/testing/bump-chrome-version.proj b/eng/testing/bump-chrome-version.proj
@@ -28,6 +28,12 @@
       <Output TaskParameter="BaseSnapshotUrl"    PropertyName="win_ChromeBaseSnapshotUrl" />
     </GetChromeVersions>
 
+    <ItemGroup>
+      <!-- ensure newline at the end -->
+      <EnvVarForPR Include="CHROME_LINUX_VER=$(linux_ChromeVersion)" />
+      <EnvVarForPR Include="CHROME_WIN_VER=$(win_ChromeVersion)" />
+    </ItemGroup>
+
     <PropertyGroup>
       <_PropsContent>
 &lt;Project&gt;
@@ -43,18 +49,15 @@
 &lt;/Project&gt;
       </_PropsContent>
 
-      <!-- ensure newline at the end -->
-      <EnvVarsForPR>
-        CHROME_LINUX_VER=$(linux_ChromeVersion)
-        CHROME_WIN_VER=$(win_ChromeVersion)
-
-      </EnvVarsForPR>
+      <EnvVarsContent>$(EnvVarsContent)
+%(EnvVarForPR.Identity)
+      </EnvVarsContent>
     </PropertyGroup>
 
     <Message Text="Writing version props: $(_PropsContent)" Importance="High" />
     <WriteLinesToFile Lines="$(_PropsContent)" File="$(RepositoryEngineeringDir)testing\ChromeVersions.props" Overwrite="true" />
 
-    <WriteLinesToFile Lines="$(EnvVarsForPR)" File="$(RepositoryEngineeringDir)testing\bump-chrome-pr.env" Overwrite="true" />
+    <WriteLinesToFile Lines="$(EnvVarsContent)" File="$(RepositoryEngineeringDir)testing\bump-chrome-pr.env" Overwrite="true" />
   </Target>
 
   <Import Project="..\..\Directory.Build.targets" />