Skip to content

Commit 26b367d

Browse files
committed
CI: Fix env:HOME
1 parent ced1cc5 commit 26b367d

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

.github/workflows/.craft.ps1

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
if ($IsWindows) {
2-
if (-not ${env:HOME}) {
3-
$env:HOME = "${env:USERPROFILE}"
4-
}
52
$python = (Get-Command py).Source
63
$python=(py -c "import sys; print(sys.executable)")
4+
$env:HOME = ${HOME}
75
} else {
86
$python = (Get-Command python3).Source
97
}
@@ -12,11 +10,11 @@ if ($IsWindows) {
1210
$env:ANDROID_NDK = $null
1311

1412
$RepoRoot = "{0}/../../" -f ([System.IO.Path]::GetDirectoryName($myInvocation.MyCommand.Definition))
15-
$command = @("${env:HOME}/craft/CraftMaster/CraftMaster/CraftMaster.py",
13+
$command = @("${HOME}/craft/CraftMaster/CraftMaster/CraftMaster.py",
1614
"--config", "${RepoRoot}/.craft.ini",
1715
"--config-override", "${RepoRoot}/.github/workflows/craft_override.ini",
1816
"--target", "${env:CRAFT_TARGET}",
19-
"--variables", "WORKSPACE=${env:HOME}/craft") + $args
17+
"--variables", "WORKSPACE=${HOME}/craft") + $args
2018

2119
Write-Host "Exec: ${python} ${command}"
2220

.github/workflows/main.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,10 @@ jobs:
7171
~/ccache
7272
key: ${{ runner.os }}-${{ matrix.target }}
7373

74+
7475
- name: Clone CraftMaster
7576
run: |
76-
if ($IsWindows -and (-not ${env:HOME})) {
77-
$env:HOME = "${env:USERPROFILE}"
78-
}
79-
git clone --depth=1 https://invent.kde.org/kde/craftmaster.git "${env:HOME}/craft/CraftMaster/CraftMaster"
77+
git clone --depth=1 https://invent.kde.org/kde/craftmaster.git "${home}/craft/CraftMaster/CraftMaster"
8078
8179
- name: Craft setup
8280
run: |
@@ -164,7 +162,7 @@ jobs:
164162
165163
- name: Prepare artifacts
166164
run: |
167-
Copy-Item "$env:HOME/craft/binaries/*" "${env:GITHUB_WORKSPACE}/binaries/" -ErrorAction SilentlyContinue
165+
Copy-Item "${home}/craft/binaries/*" "${env:GITHUB_WORKSPACE}/binaries/" -ErrorAction SilentlyContinue
168166
& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --shelve "${env:GITHUB_WORKSPACE}/.craft.shelf"
169167
Copy-Item "${env:GITHUB_WORKSPACE}/.craft.shelf" "${env:GITHUB_WORKSPACE}/binaries/"
170168

0 commit comments

Comments
 (0)