Add variants to prod (#1013)

Adds variants to prod since they're working on staging, and also
switches to the main branch of the uploader since variants are now in
the uploader's main.

Author: cmillar-trunk

.github/actions/action_tests/action.yaml

@@ -69,14 +69,15 @@ runs:
         junit-paths: junit.xml
         org-slug: trunk
         token: ${{ inputs.trunk-prod-token }}
+        variant: ${{ runner.os }}
       continue-on-error: true
       env:
         TRUNK_PUBLIC_API_ADDRESS: https://api.trunk.io
 
     - name: Upload staging results
       # TODO(Tyler): Add upload on Windows once the action supports it.
       if: "!cancelled() && runner.os != 'Windows' && inputs.trunk-staging-token != ''"
-      uses: trunk-io/analytics-uploader@gabe/surface-variant
+      uses: trunk-io/analytics-uploader@main
       with:
         junit-paths: junit.xml
         org-slug: trunk-staging-org

.github/actions/linter_tests/action.yaml

@@ -123,14 +123,15 @@ runs:
         junit-paths: junit.xml
         org-slug: trunk
         token: ${{ inputs.trunk-prod-token }}
+        variant: ${{ runner.os }}
       continue-on-error: true
       env:
         TRUNK_PUBLIC_API_ADDRESS: https://api.trunk.io
 
     - name: Upload staging results
       # TODO(Tyler): Add upload on Windows once the action supports it.
       if: "!cancelled() && runner.os != 'Windows' && inputs.trunk-staging-token != ''"
-      uses: trunk-io/analytics-uploader@gabe/surface-variant
+      uses: trunk-io/analytics-uploader@main
       with:
         junit-paths: junit.xml
         org-slug: trunk-staging-org

.github/actions/tool_tests/action.yaml

@@ -86,14 +86,15 @@ runs:
         junit-paths: junit.xml
         org-slug: trunk
         token: ${{ inputs.trunk-prod-token }}
+        variant: ${{ runner.os }}
       continue-on-error: true
       env:
         TRUNK_PUBLIC_API_ADDRESS: https://api.trunk.io
 
     - name: Upload staging results
       # TODO(Tyler): Add upload on Windows once the action supports it.
       if: "!cancelled() && runner.os != 'Windows' && inputs.trunk-staging-token != ''"
-      uses: trunk-io/analytics-uploader@gabe/surface-variant
+      uses: trunk-io/analytics-uploader@main
       with:
         junit-paths: junit.xml
         org-slug: trunk-staging-org