diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index 4c594c745..575bdcb1c 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -6,37 +6,11 @@ name: Build and Test Windows on: workflow_dispatch: pull_request: - types: [labeled] - push: - branches: - - dev - pull_request_review: - types: [submitted] jobs: - remove-run-windows-build-label: - if: github.ref_name != github.event.repository.default_branch && - github.event.label.name == 'run-windows-build' - name: Remove Run Windows Build Label - runs-on: ubuntu-24.04 - timeout-minutes: 2 - steps: - - name: Remove Run Windows Build Label - uses: Lombiq/GitHub-Actions/.github/actions/add-remove-label@dev - with: - # The token is necessary to be able to remove the label even if the workflow is triggered by a pull request - # coming from a fork. - token: ${{ secrets.LOMBIQBOT_GITHUB_PERSONAL_ACCESS_TOKEN }} - labels: run-windows-build - type: remove - build-and-test-larger-runners: - if: github.ref_name != github.event.repository.default_branch && - (github.event_name == 'workflow_dispatch' || - github.event.label.name == 'run-windows-build' || - (github.event.review.state == 'APPROVED' && contains(github.event.pull_request.labels.*.name, 'requires-windows-build'))) name: Build and Test Windows - root solution (larger runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-928 with: parent-job-name: root-solution-larger-runners machine-types: '["windows-2022-8core"]' @@ -50,11 +24,11 @@ jobs: # The currently used Elasticsearch setup action (https://github.com/elastic/elastic-github-actions/tree/master/elasticsearch) # can only be used on Linux. test-filter: FullyQualifiedName!~SecurityScanningTests&FullyQualifiedName!~BehaviorElasticsearchTests + cancel-in-progress-for-this-pr: 'false' build-and-test-standard-runners: - if: github.ref_name == github.event.repository.default_branch name: Build and Test Windows - root solution (standard runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-928 with: parent-job-name: root-solution-standard-runners # Since dev builds are not awaited by anyone, they can run on the slower free runners. @@ -69,14 +43,11 @@ jobs: # The currently used Elasticsearch setup action (https://github.com/elastic/elastic-github-actions/tree/master/elasticsearch) # can only be used on Linux. test-filter: FullyQualifiedName!~SecurityScanningTests&FullyQualifiedName!~BehaviorElasticsearchTests + cancel-in-progress-for-this-pr: 'false' build-and-test-nuget-test: - if: github.ref_name == github.event.repository.default_branch || - github.event_name == 'workflow_dispatch' || - github.event.label.name == 'run-windows-build' || - (github.event.review.state == 'APPROVED' && contains(github.event.pull_request.labels.*.name, 'requires-windows-build')) name: Build and Test Windows - NuGetTest solution - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-928 with: parent-job-name: nuget-solution machine-types: '["windows-2022"]' @@ -91,40 +62,4 @@ jobs: # every value being the same as with quotes. # yamllint disable-line rule:quoted-strings test-filter: 'FullyQualifiedName!~SecurityScanningTests&FullyQualifiedName!~BehaviorElasticsearchTests' - - powershell-static-code-analysis: - if: github.ref_name == github.event.repository.default_branch || - github.event_name == 'workflow_dispatch' || - github.event.label.name == 'run-windows-build' || - (github.event.review.state == 'APPROVED' && contains(github.event.pull_request.labels.*.name, 'requires-windows-build')) - name: PowerShell Static Code Analysis Windows - uses: Lombiq/PowerShell-Analyzers/.github/workflows/static-code-analysis.yml@dev - with: - machine-types: '["windows-2022"]' - run-windows-powershell: 'false' - - post-pull-request-checks-automation: - name: Post Pull Request Checks Automation - needs: [build-and-test-larger-runners, build-and-test-nuget-test, powershell-static-code-analysis] - if: github.event.pull_request != '' - uses: Lombiq/GitHub-Actions/.github/workflows/post-pull-request-checks-automation.yml@dev - secrets: - JIRA_BASE_URL: ${{ secrets.DEFAULT_JIRA_BASE_URL }} - JIRA_USER_EMAIL: ${{ secrets.DEFAULT_JIRA_USER_EMAIL }} - JIRA_API_TOKEN: ${{ secrets.DEFAULT_JIRA_API_TOKEN }} - MERGE_TOKEN: ${{ secrets.LOMBIQBOT_GITHUB_PERSONAL_ACCESS_TOKEN }} - - remove-windows-build-warning-label: - name: Remove Windows Build Warning Label - runs-on: ubuntu-24.04 - timeout-minutes: 2 - needs: [build-and-test-larger-runners, build-and-test-nuget-test, powershell-static-code-analysis] - steps: - - name: Remove Windows Build Warning Label - uses: Lombiq/GitHub-Actions/.github/actions/add-remove-label@dev - with: - # The token is necessary to be able to remove the label even if the workflow is triggered by a pull request - # coming from a fork. - token: ${{ secrets.LOMBIQBOT_GITHUB_PERSONAL_ACCESS_TOKEN }} - labels: requires-windows-build - type: remove + cancel-in-progress-for-this-pr: 'false' diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 058966db8..f925548d0 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,7 +2,6 @@ name: Build and Test # Runs for PRs opened for any branch, and pushes to the dev branch. on: - pull_request: push: branches: - dev diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index c1cdbb81b..d3c5f3585 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit c1cdbb81b39842e47dddf6943ca745f9fb79a53e +Subproject commit d3c5f35852a193bbfc08ca96bab400ead886f180