Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V1.1.4/main #17

Merged
merged 4 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 67 additions & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
name: multisense-zip
path: ${{github.workspace}}/MultiSense_viewer.zip

BuildUbuntu:
BuildUbuntu20:
name: Build and package for Ubuntu
needs: [ReleaseJob, VersionJob]
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
Expand Down Expand Up @@ -219,6 +219,72 @@ jobs:
asset_name: ${{ needs.VersionJob.outputs.install_path }}.deb
asset_content_type: application/zip

BuildUbuntu22:
name: Build and package for Ubuntu
needs: [ReleaseJob, VersionJob]
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
# You can convert this to a matrix build if you need cross-platform coverage.
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
runs-on: ubuntu-22.04

steps:
- name: print install location
run: echo "My output is ${{ needs.VersionJob.outputs.install_path }}"
- uses: actions/checkout@v3
with:
submodules: 'true'

- name: Prepare Vulkan SDK
uses: humbletim/[email protected]
with:
vulkan-query-version: 1.3.204.0
vulkan-components: Vulkan-Headers, Vulkan-Loader
vulkan-use-cache: true

- name: Install dependencies
run: sudo apt-get install -y cmake libx11-dev build-essential xorg-dev libtbb-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libssl-dev libgtk-3-dev libsystemd-dev libwebp-dev

#- name: update gcc11
#run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt update && sudo apt install -y gcc-11 g++-11

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGIT_SUBMODULE=OFF -DWARNINGS_AS_ERRORS=FALSE #-D CMAKE_C_COMPILER=gcc-11 -D CMAKE_CXX_COMPILER=g++-11

- name: Build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build

- name: Install
working-directory: ${{github.workspace}}/build
run: cmake --install . --config ${{env.BUILD_TYPE}}

- name: Prepare package step
working-directory: ${{github.workspace}}/build
run: |
mkdir ${{ needs.VersionJob.outputs.install_path }}/DEBIAN && cp ${{github.workspace}}/Assets/Tools/Ubuntu/control ${{ needs.VersionJob.outputs.install_path }}/DEBIAN/
mkdir -p ${{ needs.VersionJob.outputs.install_path }}/usr/share/applications && cp ${{github.workspace}}/Assets/Tools/Ubuntu/multisense.desktop ${{ needs.VersionJob.outputs.install_path }}/usr/share/applications/
cp ${{github.workspace}}/Assets/Tools/Ubuntu/start.sh ${{ needs.VersionJob.outputs.install_path }}/opt/multisense/
rm -rf ${{ needs.VersionJob.outputs.install_path }}/opt/multisense/include
rm -rf ${{ needs.VersionJob.outputs.install_path }}/opt/multisense/lib
rm -rf ${{ needs.VersionJob.outputs.install_path }}/opt/multisense/share

- name: Package
working-directory: ${{github.workspace}}/build
run: dpkg-deb --build --root-owner-group ${{ needs.VersionJob.outputs.install_path }}

- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.ReleaseJob.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: ./build/${{ needs.VersionJob.outputs.install_path }}.deb
asset_name: ${{ needs.VersionJob.outputs.install_path }}.deb
asset_content_type: application/zip


build:
name: Create Windows Installer
Expand Down
58 changes: 56 additions & 2 deletions .github/workflows/workflow_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ jobs:
name: multisense-zip
path: ${{github.workspace}}/MultiSense_viewer.zip

BuildUbuntu:
name: Build and package for Ubuntu
BuildUbuntu20:
name: Build and package for Ubuntu 20_04
needs: [VersionJob]
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
# You can convert this to a matrix build if you need cross-platform coverage.
Expand Down Expand Up @@ -135,6 +135,60 @@ jobs:
working-directory: ${{github.workspace}}/build
run: dpkg-deb --build --root-owner-group ${{ needs.VersionJob.outputs.install_path }}

BuildUbuntu22:
name: Build and package for Ubuntu 22_04
needs: [VersionJob]
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
# You can convert this to a matrix build if you need cross-platform coverage.
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
runs-on: ubuntu-22.04

steps:
- name: print install location
run: echo "My output is ${{ needs.VersionJob.outputs.install_path }}"
- uses: actions/checkout@v3
with:
submodules: 'true'

- name: Prepare Vulkan SDK
uses: humbletim/[email protected]
with:
vulkan-query-version: 1.3.204.0
vulkan-components: Vulkan-Headers, Vulkan-Loader
vulkan-use-cache: true

- name: Install dependencies
run: sudo apt-get install -y cmake libx11-dev build-essential xorg-dev libtbb-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libssl-dev libgtk-3-dev libsystemd-dev libwebp-dev

#- name: update gcc11
#run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt update && sudo apt install -y gcc-11 g++-11

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGIT_SUBMODULE=OFF -DWARNINGS_AS_ERRORS=FALSE #-D CMAKE_C_COMPILER=gcc-11 -D CMAKE_CXX_COMPILER=g++-11

- name: Build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build -- -j3

- name: Install
working-directory: ${{github.workspace}}/build
run: cmake --install . --config ${{env.BUILD_TYPE}}

- name: Prepare package step
working-directory: ${{github.workspace}}/build
run: |
mkdir ${{ needs.VersionJob.outputs.install_path }}/DEBIAN && cp ${{github.workspace}}/Assets/Tools/Ubuntu/control ${{ needs.VersionJob.outputs.install_path }}/DEBIAN/
mkdir -p ${{ needs.VersionJob.outputs.install_path }}/usr/share/applications && cp ${{github.workspace}}/Assets/Tools/Ubuntu/multisense.desktop ${{ needs.VersionJob.outputs.install_path }}/usr/share/applications/
cp ${{github.workspace}}/Assets/Tools/Ubuntu/start.sh ${{ needs.VersionJob.outputs.install_path }}/opt/multisense/
rm -rf ${{ needs.VersionJob.outputs.install_path }}/opt/multisense/include
rm -rf ${{ needs.VersionJob.outputs.install_path }}/opt/multisense/lib
rm -rf ${{ needs.VersionJob.outputs.install_path }}/opt/multisense/share

- name: Package
working-directory: ${{github.workspace}}/build
run: dpkg-deb --build --root-owner-group ${{ needs.VersionJob.outputs.install_path }}

build:
name: Create Windows Installer
Expand Down
10 changes: 10 additions & 0 deletions Assets/Tools/Ubuntu/Dockerfile_20_04
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Use Ubuntu 20.04 as the base image
FROM ubuntu:20.04

# Install required packages
RUN apt-get update && apt-get install -y \
ffmpeg \
libvulkan1 \
policykit-1 \
libgtk-3-0 \
&& rm -rf /var/lib/apt/lists/*
10 changes: 10 additions & 0 deletions Assets/Tools/Ubuntu/Dockerfile_24_04
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Use Ubuntu 20.04 as the base image
FROM ubuntu:24.04

# Install required packages
RUN apt-get update && apt-get install -y \
ffmpeg \
libvulkan1 \
policykit-1 \
libgtk-3-0 \
&& rm -rf /var/lib/apt/lists/*
Loading