more tweaks to get the actual commit

ugh why so hard to do the expected thing.

i get that its nice or whatever to automatically use a merged version,
except it isn't because its not obvious that its doing that, and I can't
access the merge commit in a subsequent checkout

.github/workflows/test.yml

@@ -38,11 +38,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.sha }}
-      - name: Run a one-line script
+          ref: ${{ github.event.pull_request.head.sha }}
+          # ref: ${{ github.sha }}
+      - run: ./test/ci.sh
         env:
+          WORKSTATION_VERSION: ${{ github.event.pull_request.head.sha }}
           BW_CLIENTID: ${{ secrets.BW_CLIENTID }}
           BW_CLIENTSECRET: ${{ secrets.BW_CLIENTSECRET }}
           WS_BW_MASTER_PASS: ${{ secrets.WS_BW_MASTER_PASS }}
-        run: ./test/ci.sh
 # Github Actions CI:1 ends here

.github/workflows/ws_tool.yaml

@@ -28,6 +28,11 @@ jobs:
           submodules: recursive
           ref: ${{ github.event.pull_request.head.ref }}
       - run: ws_tool/test/bats/bin/bats ws_tool/test
+        env:
+          WORKSTATION_VERSION: ${{ github.event.pull_request.head.sha }}
+          BW_CLIENTID: ${{ secrets.BW_CLIENTID }}
+          BW_CLIENTSECRET: ${{ secrets.BW_CLIENTSECRET }}
+          WS_BW_MASTER_PASS: ${{ secrets.WS_BW_MASTER_PASS }}
 
   full-setup:
     strategy:
@@ -45,5 +50,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-          ref: ${{ github.sha }}
+          ref: ${{ github.event.pull_request.head.sha }}
+          # ref: ${{ github.sha }}
       - run: bash ws_tool/test/ci_full_setup.bash
+        env:
+          WORKSTATION_VERSION: ${{ github.event.pull_request.head.sha }}
+          BW_CLIENTID: ${{ secrets.BW_CLIENTID }}
+          BW_CLIENTSECRET: ${{ secrets.BW_CLIENTSECRET }}
+          WS_BW_MASTER_PASS: ${{ secrets.WS_BW_MASTER_PASS }}

test/ci.sh

@@ -12,10 +12,10 @@ set -xeuo pipefail
 
 cd ~
 
-if [ "$GITHUB_SHA" == "" ]; then
+if [ "$WORKSTATION_VERSION" == "" ]; then
     WORKSTATION_BOOTSTRAP_COMMIT=master
 else
-    WORKSTATION_BOOTSTRAP_COMMIT="$GITHUB_SHA"
+    WORKSTATION_BOOTSTRAP_COMMIT="$WORKSTATION_VERSION"
 fi
 
 curl https://raw.githubusercontent.com/joelmccracken/workstation/$WORKSTATION_BOOTSTRAP_COMMIT/bootstrap-workstation.sh > bootstrap-workstation.sh

ws_tool/test/ci_full_setup.bash

@@ -5,7 +5,6 @@ set -xeuo pipefail
 rm -rf $HOME/.config/workstation
 
 unset WORKSTATION_DIR
-export WORKSTATION_VERSION="$GITHUB_SHA"
 
 bash <(curl "https://raw.githubusercontent.com/joelmccracken/workstation/${WORKSTATION_VERSION}/ws_tool/ws_install.sh")