Merge #11232 #11233

11232: Fix winget install in download cron r=Zaid-Ajaj a=Zaid-Ajaj I think the problem was the missing `|` when using multi-line scripts 😅 now I simplified this into a one-liner (attempt nr. 3) Tested using a Windows machine 11233: Include YAML 1.0.1 r=iwahbe a=iwahbe Pull in Pulumi YAML 1.0.1 to allow ejecting from YAML programs with `config` based nodes. Co-authored-by: Zaid Ajaj <Zaid-Ajaj@users.noreply.github.com> Co-authored-by: Ian Wahbe <ian@wahbe.com>
pulumi · Nov 2, 2022 · 9122140 · 9122140
3 parents 35d2a6e + f085f76 + 89259a2
commit 9122140
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/download-pulumi-cron.yml b/.github/workflows/download-pulumi-cron.yml
@@ -100,10 +100,8 @@ jobs:
     steps:
       - name: Install WinGet CLI
         shell: powershell
-        run:
-          Add-AppxPackage -Path 'https://aka.ms/Microsoft.VCLibs.x64.14.00.Desktop.appx'
-          $wingetAlreadyInstalled = Get-AppPackage -name 'Microsoft.DesktopAppInstaller'
-          if (!$wingetAlreadyInstalled) { Add-AppxPackage -Path https://aka.ms/getwinget }
+        run: |
+          try { winget --help } catch { Add-AppxPackage -Path https://aka.ms/getwinget }
       - name: Install Pulumi Using Winget
         run: winget install pulumi
       - name: Pulumi Version Details

diff --git a/pkg/go.mod b/pkg/go.mod
@@ -67,7 +67,7 @@ require (
 	github.com/hexops/gotextdiff v1.0.3
 	github.com/natefinch/atomic v1.0.1
 	github.com/pulumi/pulumi-java/pkg v0.6.0
-	github.com/pulumi/pulumi-yaml v1.0.0
+	github.com/pulumi/pulumi-yaml v1.0.1
 	github.com/segmentio/encoding v0.3.5
 	github.com/shirou/gopsutil/v3 v3.22.3
 )

diff --git a/pkg/go.sum b/pkg/go.sum
@@ -1468,8 +1468,8 @@ github.com/prometheus/prometheus v0.37.0/go.mod h1:egARUgz+K93zwqsVIAneFlLZefyGO
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/pulumi/pulumi-java/pkg v0.6.0 h1:haiSQJlhrQIBBcR0r0aQCIF8i69e4znzRnHpaNQUchE=
 github.com/pulumi/pulumi-java/pkg v0.6.0/go.mod h1:xSK2B792P8zjwYZTHYapMM1RJdue2BpRFQNYObWO0C8=
-github.com/pulumi/pulumi-yaml v1.0.0 h1:MnyFtaP1BvOlz4VN1mOY3D+5gOb7fbxkjwtdqRBvJ0k=
-github.com/pulumi/pulumi-yaml v1.0.0/go.mod h1:vxV5TdH3Xk5HRHNftcDXSbsZFJcJY9ME6k4zD+xw9OY=
+github.com/pulumi/pulumi-yaml v1.0.1 h1:P+txHPqaRd1b8Pf8vLJ1fQZTjmwFp1FDo9mCmuxI+6A=
+github.com/pulumi/pulumi-yaml v1.0.1/go.mod h1:vxV5TdH3Xk5HRHNftcDXSbsZFJcJY9ME6k4zD+xw9OY=
 github.com/pulumi/ssh-agent v0.5.1 h1:7DT4FcZNHWBAp9BFI+k0+HeBYGWbJvilJ29ra/4FlRM=
 github.com/pulumi/ssh-agent v0.5.1/go.mod h1:e6cyz/FUcE3PcJZ0tiuygkRsnHnCZcSQoQU+APbnrVA=
 github.com/rakyll/embedmd v0.0.0-20171029212350-c8060a0752a2/go.mod h1:7jOTMgqac46PZcF54q6l2hkLEG8op93fZu61KmxWDV4=