diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a784c9a359..4e6f8a95ae 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -16,6 +16,50 @@ jobs: sudo apt update sudo ./install_linux_dependencies.sh - name: build - run: cmake --build Build + run: | + cd Build + make # - name: test # run: cd build && ctest + - name: deploy_test + if: github.ref == 'refs/heads/testing' + env: + bintrayUser: ${{ secrets.bintrayUsername }} + bintrayApiKey: ${{ secrets.bintrayApiKey }} + run: | + git clone --branch linux https://github.com/open-ephys-gui-binaries/open-ephys.git + ls Build + ls Build/Release + cp -r open-ephys/shared Build/Release + cp -r open-ephys/plugins/KWIKFormat.so Build/Release/plugins + cp -r open-ephys/plugins/NWBFormat.so Build/Release/plugins + gui_ver=$(git describe --tags $(git rev-list --tags --max-count=1)) + cd Build + cp -r Release open-ephys + zipfile=open-ephys-${gui_ver}-linux-beta.zip + zip -r $zipfile open-ephys + user_info="$bintrayUser:$bintrayApiKey" + curl -T $zipfile --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-linux/$gui_ver/$zipfile + curl -X POST --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-linux/$gui_ver/publish + shell: bash + - name: deploy_release + if: github.ref == 'refs/heads/master' + env: + bintrayUser: ${{ secrets.bintrayUsername }} + bintrayApiKey: ${{ secrets.bintrayApiKey }} + run: | + git clone --branch linux https://github.com/open-ephys-gui-binaries/open-ephys.git + ls Build + ls Build/Release + cp -r open-ephys/shared Build/Release + cp -r open-ephys/plugins/KWIKFormat.so Build/Release/plugins + cp -r open-ephys/plugins/NWBFormat.so Build/Release/plugins + gui_ver=$(git describe --tags $(git rev-list --tags --max-count=1)) + cd Build + cp -r Release open-ephys + zipfile=open-ephys-${gui_ver}-linux-beta.zip + zip -r $zipfile open-ephys + user_info="$bintrayUser:$bintrayApiKey" + curl -T $zipfile --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-linux/$gui_ver/$zipfile + curl -X POST --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-linux/$gui_ver/publish + shell: bash \ No newline at end of file diff --git a/.github/workflows/notes.txt b/.github/workflows/notes.txt new file mode 100644 index 0000000000..41ce576de9 --- /dev/null +++ b/.github/workflows/notes.txt @@ -0,0 +1,12 @@ + powershell Expand-Archive neuropixels-3a.zip -DestinationPath Build/Release + powershell Expand-Archive neuropixels-pxi.zip -DestinationPath Build/Release + powershell Expand-Archive nidaq-plugin.zip -DestinationPath Build/Release + powershell Expand-Archive stream-muxer.zip -DestinationPath Build/Release + powershell Expand-Archive probe-viewer.zip -DestinationPath Build/Release + powershell Expand-Archive zmq-plugins.zip -DestinationPath Build/Release + cp -r open-ephys/shared Build/Release + cp -r open-ephys/plugins/KWIKFormat.dll Build/Release/plugins + cp -r open-ephys/plugins/NWBFormat.dll Build/Release/plugins + gui_ver=0.4.7 + zipfile=open-ephys-${gui_ver}-windows.zip + powershell Compress-Archive -Path "Build/Release" -DestinationPath ${zipfile} \ No newline at end of file diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index b3f76b638a..1210c1ebad 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -19,6 +19,46 @@ jobs: - name: build run: | cd Build - xcodebuild -project open-ephys-GUI.xcodeproj -scheme=ALL_BUILD + xcodebuild -project open-ephys-GUI.xcodeproj -scheme=ALL_BUILD -configuration Release # - name: test # run: cd build && ctest + - name: deploy_test + if: github.ref == 'refs/heads/testing' + env: + bintrayUser: ${{ secrets.bintrayUsername }} + bintrayApiKey: ${{ secrets.bintrayApiKey }} + run: | + git clone --branch mac https://github.com/open-ephys-gui-binaries/open-ephys.git + cp -r open-ephys/open-ephys.app/Contents/PlugIns/KWIKFormat.bundle Build/Release/open-ephys.app/Contents/PlugIns + cp -r open-ephys/open-ephys.app/Contents/PlugIns/NWBFormat.bundle Build/Release/open-ephys.app/Contents/PlugIns + cp -r open-ephys/open-ephys.app/Contents/shared Build/Release/open-ephys.app/Contents/ + gui_ver=$(git describe --tags $(git rev-list --tags --max-count=1)) + zipfile=open-ephys-${gui_ver}-mac-beta.zip + cd Build/Release + mkdir open-ephys + mv open-ephys.app/ open-ephys + cp -r ../../open-ephys/DataFiles open-ephys/ + zip -r $zipfile open-ephys + user_info="$bintrayUser:$bintrayApiKey" + curl -T $zipfile --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-mac/$gui_ver/$zipfile + curl -X POST --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-mac/$gui_ver/publish + - name: deploy_release + if: github.ref == 'refs/heads/master' + env: + bintrayUser: ${{ secrets.bintrayUsername }} + bintrayApiKey: ${{ secrets.bintrayApiKey }} + run: | + git clone --branch mac https://github.com/open-ephys-gui-binaries/open-ephys.git + cp -r open-ephys/open-ephys.app/Contents/PlugIns/KWIKFormat.bundle Build/Release/open-ephys.app/Contents/PlugIns + cp -r open-ephys/open-ephys.app/Contents/PlugIns/NWBFormat.bundle Build/Release/open-ephys.app/Contents/PlugIns + cp -r open-ephys/open-ephys.app/Contents/shared Build/Release/open-ephys.app/Contents/ + gui_ver=$(git describe --tags $(git rev-list --tags --max-count=1)) + zipfile=open-ephys-${gui_ver}-mac-beta.zip + cd Build/Release + mkdir open-ephys + mv open-ephys.app/ open-ephys + cp -r ../../open-ephys/DataFiles open-ephys/ + zip -r $zipfile open-ephys + user_info="$bintrayUser:$bintrayApiKey" + curl -T $zipfile --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-mac/$gui_ver/$zipfile + curl -X POST --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-mac/$gui_ver/publish \ No newline at end of file diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 94f4323ac3..f311ab911f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,8 +17,72 @@ jobs: run: | cd Build cmake -G "Visual Studio 16 2019" -A x64 .. + - name: Setup MSBuild.exe + uses: warrenbuckley/Setup-MSBuild@v1 - name: build - run: cmake --build Build + run: | + msbuild Build/ALL_BUILD.vcxproj -p:Configuration=Release -p:Platform=x64 # - name: test # run: cd build && ctest - + - name: deploy_test + if: github.ref == 'refs/heads/testing' + env: + bintrayUser: ${{ secrets.bintrayUsername }} + bintrayApiKey: ${{ secrets.bintrayApiKey }} + run: | + git clone --branch windows https://github.com/open-ephys-gui-binaries/open-ephys.git + curl -L https://dl.bintray.com/open-ephys-gui-plugins/neuropixels-3a/neuropixels-3a-windows_0.1.0-API6.zip --output neuropixels-3a.zip + curl -L https://dl.bintray.com/open-ephys-gui-plugins/neuropixels-pxi/neuropixels-pxi-windows_0.1.0-API6.zip --output neuropixels-pxi.zip + curl -L https://dl.bintray.com/open-ephys-gui-plugins/nidaq-plugin/nidaq-plugin-windows_0.1.0-API6.zip --output nidaq-plugin.zip + curl -L https://dl.bintray.com/open-ephys-gui-plugins/probe-viewer/probe-viewer-windows_0.1.0-API6.zip --output probe-viewer.zip + curl -L https://dl.bintray.com/open-ephys-gui-plugins/StreamMuxer/StreamMuxer-windows_0.1.0-API6.zip --output stream-muxer.zip + curl -L https://dl.bintray.com/open-ephys-gui-plugins/ZMQPlugins/ZMQPlugins-windows_0.1.0-API6.zip --output zmq-plugins.zip + powershell Expand-Archive neuropixels-3a.zip -DestinationPath Build/Release + powershell Expand-Archive neuropixels-pxi.zip -DestinationPath Build/Release + powershell Expand-Archive nidaq-plugin.zip -DestinationPath Build/Release + powershell Expand-Archive stream-muxer.zip -DestinationPath Build/Release + powershell Expand-Archive probe-viewer.zip -DestinationPath Build/Release + powershell Expand-Archive zmq-plugins.zip -DestinationPath Build/Release + cp -r open-ephys/shared Build/Release + cp -r open-ephys/plugins/KWIKFormat.dll Build/Release/plugins + cp -r open-ephys/plugins/NWBFormat.dll Build/Release/plugins + cd Build + mv Release open-ephys + gui_ver=$(git describe --tags $(git rev-list --tags --max-count=1)) + zipfile=open-ephys-${gui_ver}-windows-beta.zip + powershell Compress-Archive -Path "open-ephys" -DestinationPath ${zipfile} + user_info="$bintrayUser:$bintrayApiKey" + curl -T $zipfile --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-windows/$gui_ver/$zipfile + curl -X POST --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-windows/$gui_ver/publish + shell: bash + - name: deploy_release + if: github.ref == 'refs/heads/master' + env: + bintrayUser: ${{ secrets.bintrayUsername }} + bintrayApiKey: ${{ secrets.bintrayApiKey }} + run: | + git clone --branch windows https://github.com/open-ephys-gui-binaries/open-ephys.git + curl -L https://dl.bintray.com/open-ephys-gui-plugins/neuropixels-3a/neuropixels-3a-windows_0.1.0-API6.zip --output neuropixels-3a.zip + curl -L https://dl.bintray.com/open-ephys-gui-plugins/neuropixels-pxi/neuropixels-pxi-windows_0.1.0-API6.zip --output neuropixels-pxi.zip + curl -L https://dl.bintray.com/open-ephys-gui-plugins/nidaq-plugin/nidaq-plugin-windows_0.1.0-API6.zip --output nidaq-plugin.zip + curl -L https://dl.bintray.com/open-ephys-gui-plugins/probe-viewer/probe-viewer-windows_0.1.0-API6.zip --output probe-viewer.zip + curl -L https://dl.bintray.com/open-ephys-gui-plugins/StreamMuxer/StreamMuxer-windows_0.1.0-API6.zip --output stream-muxer.zip + curl -L https://dl.bintray.com/open-ephys-gui-plugins/ZMQPlugins/ZMQPlugins-windows_0.1.0-API6.zip --output zmq-plugins.zip + powershell Expand-Archive neuropixels-3a.zip -DestinationPath Build/Release + powershell Expand-Archive neuropixels-pxi.zip -DestinationPath Build/Release + powershell Expand-Archive nidaq-plugin.zip -DestinationPath Build/Release + powershell Expand-Archive stream-muxer.zip -DestinationPath Build/Release + powershell Expand-Archive probe-viewer.zip -DestinationPath Build/Release + powershell Expand-Archive zmq-plugins.zip -DestinationPath Build/Release + cp -r open-ephys/shared Build/Release + cp -r open-ephys/plugins/KWIKFormat.dll Build/Release/plugins + cp -r open-ephys/plugins/NWBFormat.dll Build/Release/plugins + cd Build + mv Release open-ephys + gui_ver=$(git describe --tags $(git rev-list --tags --max-count=1)) + zipfile=open-ephys-${gui_ver}-windows-beta.zip + powershell Compress-Archive -Path "open-ephys" -DestinationPath ${zipfile} + user_info="$bintrayUser:$bintrayApiKey" + curl -T $zipfile --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-windows/$gui_ver/$zipfile + curl -X POST --user $user_info https://api.bintray.com/content/open-ephys-gui/Test/Test-windows/$gui_ver/publish + shell: bash \ No newline at end of file diff --git a/CMAKE_README.txt b/CMAKE_README.txt index d558a2baf2..e244c21af5 100644 --- a/CMAKE_README.txt +++ b/CMAKE_README.txt @@ -7,6 +7,7 @@ Windows: "Visual Studio 12 2013 Win64" "Visual Studio 14 2015 Win64" "Visual Studio 15 2017 Win64" +"Visual Studio 16 2019" -A x64 Mac: "Xcode" Linux: (see note below) @@ -18,4 +19,4 @@ For Linux Only: On linux, Debug and Release options are generated by cmake and must be specified like so: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release .. or -cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug .. \ No newline at end of file +cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug .. diff --git a/CMakeLists.txt b/CMakeLists.txt index b04efdfcbd..b76d7b8358 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ #Open Ephys GUI main build file cmake_minimum_required(VERSION 3.5.0) -set(GUI_VERSION 0.4.5) +set(GUI_VERSION 0.4.6) string(REGEX MATCHALL "[0-9]+" VERSION_LIST ${GUI_VERSION}) set(GUI_VERSION_HEX "0x")