From 7798cce5346ff92f4899bd2d224259c1d2022d25 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Thu, 21 Mar 2024 09:32:31 +0000 Subject: [PATCH] ci: Disable windows build Signed-off-by: Ryan Northey --- .github/workflows/_build_image.yml | 26 +------------------------- .github/workflows/build.yml | 22 ---------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/.github/workflows/_build_image.yml b/.github/workflows/_build_image.yml index 66d51afd..e0b146cc 100644 --- a/.github/workflows/_build_image.yml +++ b/.github/workflows/_build_image.yml @@ -48,7 +48,6 @@ jobs: steps: - uses: envoyproxy/toolshed/gh-actions/diskspace@actions-v0.0.17 name: 'Free disk space' - if: ${{ inputs.os_family != 'windows' }} - name: 'Checkout repository' uses: actions/checkout@v3 - run: | @@ -57,24 +56,7 @@ jobs: id: container shell: bash name: Container hash - - uses: actions/setup-python@v4 - if: ${{ inputs.os_family == 'windows' }} - with: - python-version: '3.10' - - run: | - curl -fsSL --output "$TEMP/gcloud-sdk.zip" "$GCLOUD_SDK_ARCHIVE_URL" - echo "${GCLOUD_SDK_ARCHIVE_CHECKSUM} $TEMP/gcloud-sdk.zip" | sha256sum --check - unzip -q "$TEMP/gcloud-sdk.zip" -d "$PROGRAMFILES" - name: Install gcloud (Windows) - shell: bash - if: ${{ inputs.os_family == 'windows' }} - env: - GCLOUD_SDK_ARCHIVE_URL: https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-289.0.0-windows-x86_64.zip - GCLOUD_SDK_ARCHIVE_CHECKSUM: c81e80040f7f609dbc50c42cd0cd402988a5c47f467372d40b5aaca0733f46f4 - run: | - if [[ "${{inputs.os_family }}" == "windows" ]]; then - export PATH="${PROGRAMFILES}/google-cloud-sdk/bin:${PATH}" - fi cd docker ./push.sh name: Build (${{ inputs.image_prefix }}${{ inputs.distro }}@${{ steps.container.outputs.tag }}) @@ -97,16 +79,10 @@ jobs: go-version: ${{ inputs.go_version }} cache: false - uses: envoyproxy/toolshed/gh-actions/docker/registry@actions-v0.0.18 - if: ${{ inputs.test_toolchain && inputs.os_family != 'windows' }} + if: ${{ inputs.test_toolchain && inputs.os_family }} name: 'Start and load Docker registry' with: load: envoyproxy/envoy-build-ubuntu:${{ steps.container.outputs.tag }} - - uses: envoyproxy/toolshed/gh-actions/docker/registry@actions-v0.0.18 - if: ${{ inputs.test_toolchain && inputs.os_family == 'windows' }} - name: 'Start and load Docker registry (Windows)' - with: - image: stefanscherer/registry-windows:2.6.2 - load: envoyproxy/envoy-build-windows2019:${{ steps.container.outputs.tag }} - run: | toolchains/regenerate.sh if: ${{ inputs.test_toolchain }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5573a4d1..5a5a2b97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,12 +31,6 @@ jobs: - target: centos name: Linux Centos gcr_push: false - - target: windows2019 - name: Windows 2019 - gcr_push: true - gcr_name: envoy-build-windows - host_platform: windows-2019 - os_family: windows name: Build (${{ matrix.name || matrix.target }}) uses: ./.github/workflows/_build_image.yml with: @@ -62,19 +56,3 @@ jobs: secrets: bot_key: ${{ secrets.ENVOY_CI_UPDATE_BOT_KEY }} bot_id: ${{ secrets.ENVOY_CI_UPDATE_APP_ID }} - - regenerate_windows: - permissions: - contents: write - name: Regenerate toolchains (Windows) - uses: ./.github/workflows/_regenerate_toolchain.yml - if: ${{ github.event_name != 'pull_request' }} - needs: - - regenerate_linux - with: - gcr_name: envoy-build-windows - os_family: windows - host_platform: windows-2019 - secrets: - bot_key: ${{ secrets.ENVOY_CI_UPDATE_BOT_KEY }} - bot_id: ${{ secrets.ENVOY_CI_UPDATE_APP_ID }}