From feb7e4933837d0e284dc72b2b5b675bbd87f0a7d Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Fri, 13 May 2022 09:28:31 +0200 Subject: [PATCH 1/2] github: cleanup GH Action on windows-2016 Fixes: https://github.com/adoptium/infrastructure/issues/2552 --- .github/workflows/build_windows.yml | 44 ----------------------------- 1 file changed, 44 deletions(-) delete mode 100644 .github/workflows/build_windows.yml diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml deleted file mode 100644 index d545754cb0..0000000000 --- a/.github/workflows/build_windows.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Docker Windows - -on: - pull_request: - paths: - - .github/workflows/build_windows.yml - - ansible/docker/DockerFile.Windows2016_Base - - ansible/docker/Dockerfile.Windows2016_VS2017 - branches: - - master - push: - paths: - - .github/workflows/build_windows.yml - - ansible/docker/DockerFile.Windows2016_Base - - ansible/docker/Dockerfile.Windows2016_VS2017 - branches: - - master - -jobs: - build-and-push-windows2016: - name: Windows 2016 - runs-on: windows-2016 - steps: - - - uses: actions/checkout@v2 - - - name: Docker Build Windows 2016 Base Image to Docker Hub - run: docker build -t adoptopenjdk/windows2016_build_image:base -f ansible/docker/Dockerfile.windows2016_Base . - - - name: Docker Build Windows 2016 VS2017 Image to Docker Hub - run: docker build -t adoptopenjdk/windows2016_build_image:vs2017 -f ansible/docker/Dockerfile.windows2016_VS2017 . - - - name: Docker login - uses: azure/docker-login@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - if: github.ref == 'refs/heads/master' - - - name: Push Windows images to Docker Hub - run: | - docker push adoptopenjdk/windows2016_build_image:base - docker push adoptopenjdk/windows2016_build_image:vs2017 - if: github.ref == 'refs/heads/master' From 8ec179a7e77c5a2f43a2b2d2eaa29ced0b87472a Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Fri, 13 May 2022 09:33:32 +0200 Subject: [PATCH 2/2] docs: remove entry of windows image in FAQ --- FAQ.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/FAQ.md b/FAQ.md index 27be1349b8..6751abc63e 100644 --- a/FAQ.md +++ b/FAQ.md @@ -74,8 +74,6 @@ have at the moment: | [Centos6](./ansible/docker/Dockerfile.CentOS6) | [`adoptopenjdk/centos6_build_image`](https://hub.docker.com/r/adoptopenjdk/centos6_build_image)| linux/amd64 | [GH Actions](.github/workflows/build.yml) | Yes | [Alpine3](./ansible/docker/Dockerfile.Alpine3) | [`adoptopenjdk/alpine3_build_image`](https://hub.docker.com/r/adoptopenjdk/alpine3_build_image) | linux/x64 | [GH Actions](.github/workflows/build.yml) | Yes | [Alpine3](./ansible/docker/Dockerfile.Alpine3) | [`adoptopenjdk/alpine3_build_image`](https://hub.docker.com/r/adoptopenjdk/alpine3_build_image) | linux/arm64 | [Jenkins](https://ci.adoptopenjdk.net/job/centos7_docker_image_updater/) | Yes -| [Windows2016_Base](./ansible/docker/Dockerfile.Windows2016_Base) | [`adoptopenjdk/windows2016_build_image:base`](https://hub.docker.com/r/adoptopenjdk/windows2016_build_image)| windows/amd64 | [GH Actions](.github/workflows/build_windows.yml) | No -| [Windows2016_VS2017](./ansible/docker/Dockerfile.Windows2016_VS2017) | [`adoptopenjdk/windows2016_build_image:vs2017`](https://hub.docker.com/r/adoptopenjdk/windows2016_build_image)| windows/amd64 | [GH Actions](.github/workflows/build_windows.yml) | No When a change lands into master, the relevant dockerfiles are built using the appropriate CI system listed in the table above by configuring them with