diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index 29e124cfeb..532645ade3 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -364,6 +364,7 @@ jobs: name: Build windows container needs: - build + runs-on: ${{ matrix.runs_on }} strategy: matrix: include: @@ -373,10 +374,6 @@ jobs: - arch_os: windows_amd64 base_image_tag: ltsc2019 runs-on: windows-2019 - with: - arch_os: ${{ matrix.arch_os }} - runs-on: ${{ matrix.runs-on }} - base_image_tag: ${{ matrix.base_image_tag }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release_builds.yml b/.github/workflows/release_builds.yml index 7db1328448..ada93fcbfb 100644 --- a/.github/workflows/release_builds.yml +++ b/.github/workflows/release_builds.yml @@ -385,52 +385,6 @@ jobs: PLATFORM=${{ matrix.arch_os }} BUILD_TYPE_SUFFIX="-ubi" - build-windows-container-images: - name: Build Windows container - runs-on: windows-2022 - needs: - - build - strategy: - matrix: - include: - - arch_os: windows_amd64 - base_image_tag: ltsc2022 - - arch_os: windows_amd64 - base_image_tag: ltsc2019 - steps: - - uses: actions/checkout@v4 - - - name: Extract tag - id: extract_tag - run: echo "tag=$(git rev-parse HEAD)" > $GITHUB_OUTPUT - - - name: Print tag - run: echo "Running dev build for ${{ steps.extract_tag.outputs.tag }}" - - - name: Login to Open Source ECR - run: | - USERNAME=$(powershell.exe "echo \$Env:UserName") - # remove wincred entry and fix json format by replacing }, with } - cat "C:\\Users\\${USERNAME}\\.docker\\config.json" | grep -v "wincred" | sed 's/},$/}/' > "C:\\Users\\${USERNAME}\\.docker\\config.json.tmp" - mv "C:\\Users\\${USERNAME}\\.docker\\config.json.tmp" "C:\\Users\\${USERNAME}\\.docker\\config.json" - make login - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_DEV }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_DEV }} - - - name: Download binary action artifact from build phase - uses: actions/download-artifact@v4 - with: - name: otelcol-sumo-${{matrix.arch_os}}.exe - path: artifacts/ - - - name: Build and push image to Open Source ECR - run: | - cp artifacts/otelcol-sumo-${{matrix.arch_os}}.exe otelcol-sumo.exe - make build-push-container-windows \ - BUILD_TAG=${{ steps.extract_tag.outputs.tag }} \ - PLATFORM=${{ matrix.arch_os }}_${{ matrix.base_image_tag }} - push-docker-manifest: name: Push joint container manifest runs-on: ubuntu-20.04 @@ -439,7 +393,6 @@ jobs: # when darwin build fails. - build-darwin - build-container-images - - build-windows-container-images steps: - uses: actions/checkout@v4 @@ -484,7 +437,7 @@ jobs: run: | make push-container-manifest \ BUILD_TAG=${{ steps.extract_tag.outputs.tag }} \ - PLATFORMS="linux/amd64 linux/arm64 windows/amd64/ltsc2022 windows/amd64/ltsc2019" + PLATFORMS="linux/amd64 linux/arm64" - name: Push joint UBI-based container manifest for all platforms to Open Source ECR run: |