diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 64f878b52dc1..4b3b4de62a21 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -341,45 +341,10 @@ jobs: with: name: collector-packages path: ./dist/* - windows-msi: - runs-on: windows-latest - needs: [cross-compile] - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Download Binaries - uses: actions/download-artifact@v3 - with: - name: collector-binaries - path: ./bin/ - - name: Cache Wix - id: wix-cache - uses: actions/cache@v3 - with: - path: | - "C:\Program Files (x86)\WiX Toolset v3.11" - key: wix-3.11 - - name: Install Wix Toolset - if: steps.wix-cache.outputs.cache-hit != 'true' - run: .\internal\buildscripts\packaging\msi\make.ps1 Install-Tools - - run: mkdir -p dist - - name: Build MSI - run: | - $Version = if ($env:GITHUB_REF -match '^refs/tags/(\d+\.\d+\.\d+)') { $Matches[1] } else { "0.0.1" } - .\internal\buildscripts\packaging\msi\make.ps1 New-MSI -Version $Version - - name: Validate MSI - run: .\internal\buildscripts\packaging\msi\make.ps1 Confirm-MSI - - name: Upload MSI - uses: actions/upload-artifact@v3 - with: - name: collector-packages - path: ./dist/*.msi publish-check: runs-on: ubuntu-latest - needs: [build-package, windows-msi] + needs: [build-package] steps: - name: Checkout Repo uses: actions/checkout@v3 @@ -397,7 +362,7 @@ jobs: run: ./.github/workflows/scripts/verify-dist-files-exist.sh publish-dev: runs-on: ubuntu-latest - needs: [lint, unittest, integration-tests, build-package, windows-msi] + needs: [lint, unittest, integration-tests, build-package] if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) && github.repository == 'open-telemetry/opentelemetry-collector-contrib' steps: - name: Checkout Repo @@ -458,7 +423,7 @@ jobs: docker push otel/opentelemetry-collector-contrib-dev:latest publish-stable: runs-on: ubuntu-latest - needs: [lint, unittest, integration-tests, build-package, windows-msi] + needs: [lint, unittest, integration-tests, build-package] if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'open-telemetry/opentelemetry-collector-contrib' steps: - name: Checkout Repo