From da551f989926babcc16e86e862c7adbcad085e67 Mon Sep 17 00:00:00 2001 From: George Adams Date: Tue, 15 Oct 2024 14:59:26 +0100 Subject: [PATCH] skip Windows updates --- .github/workflows/build_windows.yml | 5 +++++ ansible/docker/Dockerfile.win2022 | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 0dc5ad63d1..7229678e2a 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -14,6 +14,11 @@ on: branches: - master +# Cancel existing runs if user makes another push. +concurrency: + group: "${{ github.ref }}" + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + permissions: id-token: write contents: read diff --git a/ansible/docker/Dockerfile.win2022 b/ansible/docker/Dockerfile.win2022 index 3674a2f145..173d0d66e6 100644 --- a/ansible/docker/Dockerfile.win2022 +++ b/ansible/docker/Dockerfile.win2022 @@ -51,7 +51,7 @@ RUN net user ansible %PW% /ADD & net localgroup "Administrators" ansible /ADD & echo localhost ansible_connection=winrm > infrastructure/ansible/hosts & \ cd infrastructure\ansible & \ C:\cygwin64\bin\python3.7m.exe /usr/bin/ansible-playbook -e git_sha=00000000 -e ansible_user=ansible -e ansible_password=%PW% -i hosts \ - --skip-tags=adoptopenjdk,reboot,NTP_TIME,MSVS_2013,MSVS_2017,MSVS_2019 playbooks/AdoptOpenJDK_Windows_Playbook/main.yml & \ + --skip-tags=adoptopenjdk,reboot,Windows_Updates,NTP_TIME,MSVS_2013,MSVS_2017,MSVS_2019 playbooks/AdoptOpenJDK_Windows_Playbook/main.yml & \ net user ansible /DELETE ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "&&", "powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]