split out windows command

posit-dev · Oct 22, 2024 · e816c97 · e816c97
1 parent bb6be15
commit e816c97
Showing 1 changed file with 26 additions and 3 deletions.
diff --git a/.github/workflows/contract.yaml b/.github/workflows/contract.yaml
@@ -53,7 +53,7 @@ jobs:
         run: |
           sudo apt-get install libcurl4-openssl-dev libsodium-dev libfontconfig1-dev libfribidi-dev libfontconfig1-dev libpng-dev
           R -e "install.packages('renv', repos='https://packagemanager.posit.co/cran/latest')"
-        if: matrix.runs-on == 'ubuntu-latest'
+        if: matrix.runs-on != 'windows-latest'
       - name: Install deps on windows
         run: |
           R.exe -e "install.packages('renv', repos='https://packagemanager.posit.co/cran/latest')"
@@ -62,10 +62,22 @@ jobs:
         run: |
           R -e "install.packages('renv', repos='https://packagemanager.posit.co/cran/latest')"
         if: matrix.runs-on == 'macos-latest'
+
+      - name: Set CONNECT_SERVER on Linux and macOS
+        if: runner.os != 'Windows'
+        run: |
+          export CONNECT_SERVER=$(fuzzbucket-client -j list | jq -r '.boxes[] | select(.name | contains("connect-publishing-client")) | .public_ip')
+          echo "CONNECT_SERVER=$CONNECT_SERVER" >> $GITHUB_ENV
+
+      - name: Set CONNECT_SERVER on Windows
+        if: runner.os == 'Windows'
+        run: |
+          $connectServer = fuzzbucket-client -j list | jq -r '.boxes[] | select(.name | contains("connect-publishing-client")) | .public_ip'
+          echo "CONNECT_SERVER=$connectServer" >> $env:GITHUB_ENV
+
       - name: Run Bats Tests
         run: |
           chmod -R +x ./bin
-          export CONNECT_SERVER=$(fuzzbucket-client -j list | jq -r '.boxes[] | select(.name | contains("connect-publishing-client")) | .public_ip')
           just bats install
           just bats test common
           just bats test init
@@ -138,10 +150,21 @@ jobs:
           unzip dist/*-darwin-arm64.vsix -d dist/ext
         if: matrix.runs-on == 'macos-latest'
 
+      - name: Set CONNECT_SERVER on Linux and macOS
+        if: runner.os != 'Windows'
+        run: |
+          export CONNECT_SERVER=$(fuzzbucket-client -j list | jq -r '.boxes[] | select(.name | contains("connect-publishing-client")) | .public_ip')
+          echo "CONNECT_SERVER=$CONNECT_SERVER" >> $GITHUB_ENV
+
+      - name: Set CONNECT_SERVER on Windows
+        if: runner.os == 'Windows'
+        run: |
+          $connectServer = fuzzbucket-client -j list | jq -r '.boxes[] | select(.name | contains("connect-publishing-client")) | .public_ip'
+          echo "CONNECT_SERVER=$connectServer" >> $env:GITHUB_ENV
+
       - name: Run VSCode UI Tests
         run: |
           chmod -R +x ./bin
-          export CONNECT_SERVER=$(fuzzbucket-client -j list | jq -r '.boxes[] | select(.name | contains("connect-publishing-client")) | .public_ip')
           just vscode configure
           just vscode-ui install
           just vscode-ui test vscode-root