diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index dd79f34..9e772c5 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -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", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7da417c..bb3dfc1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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" diff --git a/.github/workflows/high.yml b/.github/workflows/high.yml index 4dcb5a6..4f77a8c 100644 --- a/.github/workflows/high.yml +++ b/.github/workflows/high.yml @@ -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" diff --git a/docs/index.md b/docs/index.md index 2dbd521..4537ca2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -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: diff --git a/scripts/Initialize-Linux.ps1 b/scripts/Initialize-Linux.ps1 deleted file mode 100644 index 2d29cc1..0000000 --- a/scripts/Initialize-Linux.ps1 +++ /dev/null @@ -1,19 +0,0 @@ -<#.SYNOPSIS -Initialize Linux machine.#> -if ($IsLinux) { - sudo apt update - # ! https://askubuntu.com/questions/900285/libegl-so-1-is-not-a-symbolic-link - # ! https://askubuntu.com/a/1460390 - # ! https://github.com/mccdaq/uldaq - sudo apt install 'libegl1-mesa-dev' 'libxkbcommon0' 'libxcb-cursor0' 'libxcb-xinerama0' 'libqt5x11extras5' 'gcc' 'g++' 'make' 'bzip2' 'gzip' 'libusb-1.0-0-dev' -} -curl -L -O 'https://github.com/mccdaq/uldaq/releases/download/v1.2.1/libuldaq-1.2.1.tar.bz2' -$Archive = 'libuldaq-1.2.1.tar.bz2' -tar -xvjf $Archive -Remove-Item $Archive -$Source = 'libuldaq-1.2.1' -Push-Location $Source -./configure && make -sudo make install -Pop-Location -Remove-Item -Recurse -Force $Source