Skip to content

Commit

Permalink
[CI] Remove flaky windows-msi check
Browse files Browse the repository at this point in the history
  • Loading branch information
djaglowski committed May 19, 2022
1 parent ff0cb79 commit 5a10c2f
Showing 1 changed file with 3 additions and 38 deletions.
41 changes: 3 additions & 38 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5a10c2f

Please sign in to comment.