diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2022-02-10 18:37:48 +0300 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2022-02-10 18:53:25 +0300 |
| commit | 68eacec89b8dec744484fd3214a09e6e1d556c9c (patch) | |
| tree | bc22a75317de930e39b4ef291ce8c9c2ba32949c /.github | |
| parent | f59ef3b3ca6dde42db7e7b6cf9d073e4cf0bbc3e (diff) | |
Ci: Skip python2 in github actions
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/.craft.ps1 | 6 | ||||
| -rw-r--r-- | .github/workflows/craft_override.ini | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/.github/workflows/.craft.ps1 b/.github/workflows/.craft.ps1 index b1e5a31a9..39d3782b5 100644 --- a/.github/workflows/.craft.ps1 +++ b/.github/workflows/.craft.ps1 @@ -3,7 +3,11 @@ if ($IsWindows) { } else { $python = (Get-Command python3).Source } -$command = @("${env:HOME}/craft/CraftMaster/CraftMaster/CraftMaster.py", "--config", "${env:GITHUB_WORKSPACE}/.craft.ini", "--target", "${env:CRAFT_TARGET}", "--variables", "WORKSPACE=${env:HOME}/craft") + $args +$command = @("${env:HOME}/craft/CraftMaster/CraftMaster/CraftMaster.py", + "--config", "${env:GITHUB_WORKSPACE}/.craft.ini", + "--config-override", "${env:GITHUB_WORKSPACE}/.github/workflows/craft_override.ini", + "--target", "${env:CRAFT_TARGET}", + "--variables", "WORKSPACE=${env:HOME}/craft") + $args Write-Host "Exec: ${python} ${command}" diff --git a/.github/workflows/craft_override.ini b/.github/workflows/craft_override.ini new file mode 100644 index 000000000..fb0bdbaf5 --- /dev/null +++ b/.github/workflows/craft_override.ini @@ -0,0 +1,4 @@ +[BlueprintSettings] +# no longer preinstalled on the github images and only required to build dev-utils/breakpad-tools +dev-utils/python2.ignored = True +dev-utils/breakpad-tools.ignored = True |