diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2022-02-14 13:13:04 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2022-02-14 13:13:04 +0300 |
| commit | d1bfb404a0f2058840da478f8d6ca34b6d78ebdd (patch) | |
| tree | 9493e3e7dad3b3bbb2a24fa556a94f17e57d2db0 /.github | |
| parent | 0e368b350388bb9e1856a359ca4b61608e7504ae (diff) | |
| parent | ec4e2069ff65e66e1f2246b3216e768351a0d2b6 (diff) | |
Merge remote-tracking branch 'origin/2.10'
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/.craft.ps1 | 6 | ||||
| -rw-r--r-- | .github/workflows/craft_override.ini | 4 | ||||
| -rw-r--r-- | .github/workflows/stale.yml | 2 |
3 files changed, 10 insertions, 2 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 diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 2e4abd89e..f09f8d935 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -12,7 +12,7 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} debug-only: false exempt-all-milestones: true - exempt-issue-labels: "blue-ticket, p1-urgent, p2-high, p3-medium, p4-low" + exempt-issue-labels: "blue-ticket, p1-urgent, p2-high, p3-medium, p4-low, QA:team" days-before-stale: 30 stale-issue-message: "This issue was marked stale because it has been open for 30 days with no activity. Remove the stale label or comment or this will be closed in 7 days." days-before-close: 7 |