Make sure instrumentation is enabled before testing for it

ddev · Jun 4, 2021 · 4283284 · 4283284
1 parent 2d89452
commit 4283284
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml
@@ -43,11 +43,14 @@ jobs:
 
       - name: "Verify that SegmentKey is working (Linux amd64)"
         run: |
+          export PATH=".gotmp/bin/linux_amd64:$PATH"
           echo "DDEV_NO_INSTRUMENTATION=${DDEV_NO_INSTRUMENTATION}"
           if [ -z "${SegmentKey}" ]; then echo "SegmentKey is not set"; exit 1; fi
-          .gotmp/bin/linux_amd64/ddev config global
-          .gotmp/bin/linux_amd64/ddev config global | grep instrumentation-opt-in=true
-          .gotmp/bin/linux_amd64/ddev config global | grep -v "SegmentKey is not available."
+          ddev config global --instrumentation-opt-in=true
+          ddev config global | grep instrumentation-opt-in=true
+          ddev config global | grep -v "SegmentKey is not available."
+          ddev config global --instrumentation-opt-in=false
+
 
       - name: save build results to cache
         uses: actions/cache@v2
@@ -78,11 +81,13 @@ jobs:
 
       - name: "Verify that SegmentKey is working (Windows)"
         run: |
+          export PATH=".gotmp/bin/windows_amd64:$PATH"
           echo "DDEV_NO_INSTRUMENTATION=${DDEV_NO_INSTRUMENTATION}"
           if [ -z "${SegmentKey}" ]; then echo "SegmentKey is not set"; exit 1; fi
-          .gotmp/bin/windows_amd64/ddev config global
-          .gotmp/bin/windows_amd64/ddev.exe config global | grep instrumentation-opt-in=true
-          .gotmp/bin/windows_amd64/ddev.exe config global | grep -v "SegmentKey is not available."
+          ddev config global --instrumentation-opt-in=true
+          ddev config global | grep instrumentation-opt-in=true
+          ddev config global | grep -v "SegmentKey is not available."
+          ddev config global --instrumentation-opt-in=false
 
       - name: Cache signed binaries
         uses: actions/cache@v2