handle extra experiments

matifali · matifali · commit b1e966338357 · 2023-07-30T13:24:13.000Z
diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
@@ -243,10 +243,7 @@ jobs:
           if [[ ${{ github.event_name }} == "workflow_dispatch" ]]; then
             experiments=${{ github.event.inputs.experiments }}
           else
-            experiments=$(echo "${{ github.event.comment.body }}" | grep -oP '(?<=--experiments ).*')
-            if [ -z "$experiments" ]; then
-              experiments="*"
-            fi
+            experiments=$(echo "${{ github.event.comment.body }}" | grep -oP '(?<=--experiments )[^ ]+')
           fi
           echo "experiments=$experiments" >> $GITHUB_OUTPUT
 
@@ -266,7 +263,7 @@ jobs:
               - name: "CODER_WILDCARD_ACCESS_URL"
                 value: "*.${{ env.PR_DEPLOYMENT_ACCESS_URL }}"
               - name: "CODER_EXPERIMENTS"
-                value: "${{ steps.get_experiments.outputs.experiments }}"
+                value: "*,${{ steps.get_experiments.outputs.experiments }}"
               - name: CODER_PG_CONNECTION_URL
                 valueFrom:
                   secretKeyRef:
diff --git a/scripts/deploy-pr.sh b/scripts/deploy-pr.sh
@@ -84,4 +84,9 @@ if $dryRun; then
 	exit 0
 fi
 
+echo "branchName: ${branchName}"
+echo "prNumber: ${prNumber}"
+echo "skipBuild: ${skipBuild}"
+echo "experiments: ${experiments}"
+
 gh workflow run pr-deploy.yaml --ref "${branchName}" -f "pr_number=${prNumber}" -f "skip_build=${skipBuild}"
