test

signalfx · Jul 26, 2024 · d4687f8 · d4687f8
1 parent 4ab1119
commit d4687f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/otelcol-fips.yml b/.github/workflows/otelcol-fips.yml
@@ -31,15 +31,13 @@ jobs:
       - name: setup microsoft golang with fips
         if: ${{ runner.os == 'Windows' }}
         run: |
-          Invoke-WebRequest -Uri https://aka.ms/golang/release/latest/go${{ env.GO_VERSION }}-1.windows-amd64.zip -OutFile golang.zip
-          Expand-Archive -Path golang.zip -DestinationPath C:\
+          mkdir -p /c/golang-fips
+          curl -sSLf -o /c/golang-fips/golang.zip https://aka.ms/golang/release/latest/go${{ env.GO_VERSION }}-1.windows-amd64.zip
+          unzip -q -d /c/golang-fips /c/golang-fips/golang.zip
+          echo "PATH=/c/golang-fips/go/bin:${PATH}" >> $GITHUB_ENV
+        shell: bash
+      - run: command -v go
       - run: make otelcol-fips
-        if: runner.os != 'Windows'
-      - run: |
-          $env:PATH = 'C:\go\bin;' + $env:PATH
-          get-command go.exe
-          make otelcol-fips
-        if: runner.os == 'Windows'
       - uses: actions/upload-artifact@v4
         if: always()
         with:

diff --git a/Makefile b/Makefile
@@ -232,6 +232,6 @@ ifeq ($(GOOS), windows)
 	GOEXPERIMENT=systemcrypto GOFLAGS=-tags=requirefips CGO_ENABLED=1 EXTENSION=_fips.exe $(MAKE) otelcol VERSION="$(VERSION)-fips"
 else
 	GOEXPERIMENT=boringcrypto CGO_ENABLED=1 EXTENSION=_fips $(MAKE) otelcol VERSION="$(VERSION)-fips"
+	go tool nm ./bin/otelcol_$(GOOS)_$(GOARCH)_fips | grep "crypto/internal/boring/sig.BoringCrypto.abi0"
+	go tool nm ./bin/otelcol_$(GOOS)_$(GOARCH)_fips | grep "crypto/internal/boring/sig.FIPSOnly.abi0"
 endif
-	# go tool nm ./bin/otelcol | grep "crypto/internal/boring/sig.BoringCrypto.abi0"
-	# go tool nm ./bin/otelcol | grep "crypto/internal/boring/sig.FIPSOnly.abi0"