Skip to content

Commit

Permalink
Run uldaq init on MacOS high as well
Browse files Browse the repository at this point in the history
  • Loading branch information
blakeNaccarato committed Jul 8, 2024
1 parent 6df1ca0 commit 6bf28e9
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 24 deletions.
5 changes: 4 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
"ghcr.io/joshuanianji/devcontainer-features/gcloud-cli-persistence:1.0.3": {}
},
"onCreateCommand": {
"install-pyqtgraph-deps": ["pwsh", "scripts/Initialize-Linux.ps1"],
"install-pyqtgraph-deps": [
"pwsh",
"scripts/Initialize-UldaqLinuxMacOS.ps1"
],
"set-up-profile": [
"pwsh",
"-Command",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:
with:
submodules: True
- if: startsWith(matrix.runner, 'ubuntu') || startsWith(matrix.runner, 'macos')
run: "scripts/Initialize-Linux.ps1"
run: "scripts/Initialize-UldaqLinuxMacOS.ps1"
- uses: "actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e" # v4.1.7
with:
name: "lock"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/high.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ jobs:
- uses: "actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332" # v4.1.7
with:
submodules: True
- if: startsWith(matrix.runner, 'ubuntu')
run: "scripts/Initialize-Linux.ps1"
- if: startsWith(matrix.runner, 'ubuntu') || startsWith(matrix.runner, 'macos')
run: "scripts/Initialize-UldaqLinuxMacOS.ps1"
- uses: "actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e" # v4.1.7
with:
name: "lock"
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Data acquisition for a nucleate pool boiling experimental apparatus.

## Installation on WSL

Run [](../scripts/Initialize-Linux.ps1).
Run [](../scripts/Initialize-UldaqLinuxMacOS.ps1).

:::{toctree}
:hidden:
Expand Down
19 changes: 0 additions & 19 deletions scripts/Initialize-Linux.ps1

This file was deleted.

0 comments on commit 6bf28e9

Please sign in to comment.