Skip to content

Commit 77b420e

Browse files
committed
Merge branch 'version/0-47-1-RC1' into mitchell/dx-3224
2 parents f5bfad5 + 5b0c39c commit 77b420e

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,16 @@ jobs:
8181
- # === Install State Tool ===
8282
name: Install State Tool
8383
uses: ActiveState/setup-state-tool@v1
84+
if: runner.os != 'Windows'
85+
86+
- # === Install State Tool (Windows) ===
87+
name: Install State Tool (Windows)
88+
if: runner.os == 'Windows'
89+
shell: pwsh
90+
run: |
91+
Invoke-Expression -Command ".\installers\install.ps1 -n"
92+
echo "$env:LOCALAPPDATA\ActiveState\StateTool\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
93+
Invoke-Expression "$env:LOCALAPPDATA\ActiveState\StateTool\release\bin\state config set optin.unstable true"
8494
8595
- # === Setup ===
8696
name: Setup
@@ -262,7 +272,7 @@ jobs:
262272

263273
- # === Configure AWS credentials ==
264274
name: Configure AWS credentials
265-
uses: aws-actions/configure-aws-credentials@v2
275+
uses: aws-actions/configure-aws-credentials@v4
266276
with:
267277
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
268278
role-session-name: ${{ env.AWS_ROLE_SESSION_NAME }}
@@ -482,7 +492,7 @@ jobs:
482492

483493
- # === Configure AWS credentials ==
484494
name: Configure AWS credentials
485-
uses: aws-actions/configure-aws-credentials@v2
495+
uses: aws-actions/configure-aws-credentials@v4
486496
with:
487497
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
488498
role-session-name: ${{ env.AWS_ROLE_SESSION_NAME }}

activestate.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ scripts:
8181
- name: install-deps-ci
8282
language: bash
8383
standalone: true
84-
if: ne .Shell "cmd"
8584
value: |
8685
if { [[ "$GOOS" == "windows" ]] || [[ "$OS" == "Windows_NT" ]]; } && ! type "goversioninfo" &> /dev/null; then
8786
echo "goversioninfo was not found on your PATH. Installing .."

installers/install.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ function setShellOverride
154154
$currentPid = $PID
155155
while ($currentPid -ne 0)
156156
{
157-
$process = Get-WmiObject Win32_Process | Where-Object { $_.ProcessId -eq $currentPid }
157+
$process = Get-CimInstance Win32_Process | Where-Object { $_.ProcessId -eq $currentPid }
158158
if (!$process) { break }
159159

160160
if ($process.Name -eq "cmd" -or $process.Name -eq "cmd.exe")

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.47.1-RC1
1+
0.47.1-RC1

0 commit comments

Comments
 (0)