removing windows-msi

.github/workflows/build-and-test.yml

@@ -56,9 +56,6 @@ jobs:
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
           echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-          echo "$PATH"
-          echo "$(GITHUB_PATH)"
-          echo "$GITHUB_PATH"
       - name: Install tools
         run: make install-tools
       - name: Upload tool binaries
@@ -219,16 +216,17 @@ jobs:
           echo "/opt/td-agent-bit/bin" >> $GITHUB_PATH
           sudo ln -s /opt/td-agent-bit/bin/td-agent-bit /usr/local/bin/fluent-bit
       - run: mkdir -p results && touch results/TESTRESULTS.md
-      - run: echo "$PATH"
       - name: Loadtest
         run: make testbed-loadtest
         env:
           TEST_ARGS: "-test.run=${{ matrix.test }}"
       - name: Create test result archive # some test results have invalid characters
         if: ${{ failure() || success() }}
+        continue-on-error: true
         run: tar -cvf test_results.tar testbed/tests/results
       - name: Upload test results
         if: ${{ failure() || success() }}
+        continue-on-error: true
         uses: actions/upload-artifact@v2
         with:
           name: test-results
@@ -273,41 +271,6 @@ jobs:
         if: ${{ failure() && github.ref == 'ref/head/master' }}
         run: |
           go run cmd/issuegenerator/main.go $TEST_RESULTS
-  windows-msi:
-    runs-on: windows-latest
-    needs: [cross-compile]
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Setup Go
-        uses: actions/[email protected]
-        with:
-          go-version: 1.15
-      - name: Setup env
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-      - name: Download collector binaries
-        uses: actions/download-artifact@v2
-        with:
-          name: collector-binaries
-          path: ./bin
-      - run: mkdir -p dist
-      - name: Install Wix Toolset
-        run: .\internal\buildscripts\packaging\msi\make.ps1 Install-Tools
-      - 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@v2
-        with:
-          name: windows-msi
-          path: ./dist/*.msi
   build-package:
     runs-on: ubuntu-latest
     needs: [cross-compile]

internal/buildscripts/packaging/msi/make.ps1

@@ -15,7 +15,7 @@
 <#
 .SYNOPSIS
     Makefile like build commands for the Collector on Windows.
-
+    
     Usage:   .\make.ps1 <Command> [-<Param> <Value> ...]
     Example: .\make.ps1 New-MSI -Config "./my-config.yaml" -Version "v0.0.2"
 .PARAMETER Target
@@ -35,21 +35,14 @@ function Install-Tools {
     $ProgressPreference = $OriginalPref
 
     choco install wixtoolset -y
-    # setx /m PATH "%PATH%;C:\Program Files (x86)\WiX Toolset v3.11\bin"
-    echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" >> $GITHUB_PATH
-    echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" >> $PATH
-    echo "$($GITHUB_PATH)"
-    echo "$($PATH)"
+    setx /m PATH "%PATH%;C:\Program Files (x86)\WiX Toolset v3.11\bin"
     refreshenv
 }
 
 function New-MSI(
     [string]$Version="0.0.1",
     [string]$Config="./examples/local/otel-config.yaml"
 ) {
-    refreshenv
-    echo "$($GITHUB_PATH)"
-    echo "$($PATH)"
     candle -arch x64 -dVersion="$Version" -dConfig="$Config" internal/buildscripts/packaging/msi/opentelemetry-collector.wxs
     light opentelemetry-collector.wixobj
     mkdir dist -ErrorAction Ignore