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.

Sign up for GitHub

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

Test CI works with up-transport-vsomeip-rust build changes #60

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Test CI works with up-transport-vsomeip-rust build changes #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da84158
Add shell script to set environment variables, updated CI workflows t…
PLeVasseur Jan 8, 2025
0e9dd9e
Update up-transport-vsomeip-rust and up-streamer-rust to use up-rust …
PLeVasseur Jan 8, 2025
4f2d98f
Update up-transport-mqtt5 to 0.2.0
PLeVasseur Jan 8, 2025
b12bbaa
Add necessary piping through of environment variables for paths to C+…
PLeVasseur Jan 8, 2025
4e48ea0
Update to published up-transport-vsomeip 0.4.1
PLeVasseur Jan 23, 2025
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
48 changes: 43 additions & 5 deletions .github/workflows/bundled-lint-and-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ name: Lint and Test - Bundled

env:
VSOMEIP_INSTALL_PATH: vsomeip-install
GENERIC_CPP_STDLIB_PATH: /usr/include/c++/11
ARCH_SPECIFIC_CPP_STDLIB_PATH: /usr/include/x86_64-linux-gnu/c++/11

on:
push:
Expand All @@ -35,9 +33,35 @@ concurrency:

jobs:

set-env:
name: Set environment variables
runs-on: ubuntu-22.04

outputs:
arch_specific_cpp_stdlib_path: ${{ steps.set_env.outputs.arch_specific_cpp_stdlib_path }}
generic_cpp_stdlib_path: ${{ steps.set_env.outputs.generic_cpp_stdlib_path }}

steps:
- uses: actions/checkout@v4

- name: Add execute permissions for envsetup
run: chmod +x build/envsetup.sh

- name: Set stdlib paths dynamically
id: set_env
run: |
source ./build/envsetup.sh highest
echo "arch_specific_cpp_stdlib_path=$ARCH_SPECIFIC_CPP_STDLIB_PATH" >> $GITHUB_OUTPUT
echo "generic_cpp_stdlib_path=$GENERIC_CPP_STDLIB_PATH" >> $GITHUB_OUTPUT

lint:
name: Lint
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: set-env

env:
ARCH_SPECIFIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.arch_specific_cpp_stdlib_path }}
GENERIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.generic_cpp_stdlib_path }}

steps:
- uses: actions/checkout@v4
Expand All @@ -48,10 +72,14 @@ jobs:
- name: Set environment variables
run: |
echo "VSOMEIP_INSTALL_PATH=${{ github.workspace }}/${{ env.VSOMEIP_INSTALL_PATH }}" >> $GITHUB_ENV
env

- name: Print environment variables for debugging
run: |
echo "VSOMEIP_INSTALL_PATH: ${{ env.VSOMEIP_INSTALL_PATH }}"
echo "GENERIC_CPP_STDLIB_PATH: ${{ env.GENERIC_CPP_STDLIB_PATH }}"
echo "ARCH_SPECIFIC_CPP_STDLIB_PATH: ${{ env.ARCH_SPECIFIC_CPP_STDLIB_PATH }}"
env

- name: Ensure vsomeip install path exists
run: |
Expand Down Expand Up @@ -81,7 +109,12 @@ jobs:

test:
name: Test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: set-env

env:
ARCH_SPECIFIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.arch_specific_cpp_stdlib_path }}
GENERIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.generic_cpp_stdlib_path }}

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -146,7 +179,12 @@ jobs:

build-docs:
name: Build documentation
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: set-env

env:
ARCH_SPECIFIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.arch_specific_cpp_stdlib_path }}
GENERIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.generic_cpp_stdlib_path }}

steps:
- uses: actions/checkout@v4
Expand Down
69 changes: 57 additions & 12 deletions .github/workflows/unbundled-lint-and-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ env:
VSOMEIP_SOURCE_PATH: vsomeip-src
VSOMEIP_INSTALL_PATH: vsomeip-install

GENERIC_CPP_STDLIB_PATH: /usr/include/c++/11
ARCH_SPECIFIC_CPP_STDLIB_PATH: /usr/include/x86_64-linux-gnu/c++/11

on:
push:
branches: [ main ]
Expand All @@ -38,10 +35,39 @@ concurrency:
cancel-in-progress: true

jobs:

set-env:
name: Set environment variables
runs-on: ubuntu-22.04

outputs:
arch_specific_cpp_stdlib_path: ${{ steps.set_env.outputs.arch_specific_cpp_stdlib_path }}
generic_cpp_stdlib_path: ${{ steps.set_env.outputs.generic_cpp_stdlib_path }}

steps:
- uses: actions/checkout@v4

- name: Add execute permissions for envsetup
run: chmod +x build/envsetup.sh

- name: Set stdlib paths dynamically
id: set_env
run: |
source ./build/envsetup.sh highest
echo "arch_specific_cpp_stdlib_path=$ARCH_SPECIFIC_CPP_STDLIB_PATH" >> $GITHUB_OUTPUT
echo "generic_cpp_stdlib_path=$GENERIC_CPP_STDLIB_PATH" >> $GITHUB_OUTPUT

obtain_and_build_vsomeip:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: set-env

outputs:
cache_key: ${{ steps.generate_cache_key.outputs.CACHE_KEY }}

env:
ARCH_SPECIFIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.arch_specific_cpp_stdlib_path }}
GENERIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.generic_cpp_stdlib_path }}

steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -52,14 +78,18 @@ jobs:
echo "VSOMEIP_SOURCE_PATH=${{ github.workspace }}/${{ env.VSOMEIP_SOURCE_PATH }}" >> $GITHUB_ENV
echo "VSOMEIP_INSTALL_PATH=${{ github.workspace }}/${{ env.VSOMEIP_INSTALL_PATH }}" >> $GITHUB_ENV
echo "VSOMEIP_SOURCE_PATH_WITH_WILDCARD=${{ github.workspace }}/${{ env.VSOMEIP_SOURCE_PATH }}/*" >> $GITHUB_ENV
env

- name: Print environment variables for debugging
run: |
echo "VSOMEIP_SOURCE_TARBALL: ${{ env.VSOMEIP_SOURCE_TARBALL }}"
echo "VSOMEIP_SOURCE_PATH: ${{ env.VSOMEIP_SOURCE_PATH }}"
echo "VSOMEIP_INSTALL_PATH: ${{ env.VSOMEIP_INSTALL_PATH }}"
echo "VSOMEIP_SOURCE_PATH_WITH_WILDCARD: ${{ env.VSOMEIP_SOURCE_PATH_WITH_WILDCARD }}"

echo "GENERIC_CPP_STDLIB_PATH: ${{ env.GENERIC_CPP_STDLIB_PATH }}"
echo "ARCH_SPECIFIC_CPP_STDLIB_PATH: ${{ env.ARCH_SPECIFIC_CPP_STDLIB_PATH }}"
env

- name: Download tarball
run: |
wget -O vsomeip-source.tar.gz $VSOMEIP_SOURCE_TARBALL
Expand Down Expand Up @@ -101,7 +131,7 @@ jobs:

- name: Install dependencies
if: steps.cache-vsomeip.outputs.cache-hit != 'true'
run: sudo apt-get install -y build-essential cmake libboost-all-dev
run: sudo apt-get install -y build-essential cmake libboost-all-dev doxygen asciidoc

- name: Build vsomeip
if: steps.cache-vsomeip.outputs.cache-hit != 'true'
Expand All @@ -119,9 +149,14 @@ jobs:

lint:
name: Lint
needs: obtain_and_build_vsomeip
runs-on: ubuntu-latest
needs:
- obtain_and_build_vsomeip
- set-env
runs-on: ubuntu-22.04

env:
ARCH_SPECIFIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.arch_specific_cpp_stdlib_path }}
GENERIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.generic_cpp_stdlib_path }}
CACHE_KEY: ${{ needs.obtain_and_build_vsomeip.outputs.cache_key }}

steps:
Expand Down Expand Up @@ -178,9 +213,14 @@ jobs:

test:
name: Test
needs: obtain_and_build_vsomeip
runs-on: ubuntu-latest
needs:
- obtain_and_build_vsomeip
- set-env
runs-on: ubuntu-22.04

env:
ARCH_SPECIFIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.arch_specific_cpp_stdlib_path }}
GENERIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.generic_cpp_stdlib_path }}
CACHE_KEY: ${{ needs.obtain_and_build_vsomeip.outputs.cache_key }}

steps:
Expand Down Expand Up @@ -257,9 +297,14 @@ jobs:

build-docs:
name: Build documentation
needs: obtain_and_build_vsomeip
runs-on: ubuntu-latest
needs:
- obtain_and_build_vsomeip
- set-env
runs-on: ubuntu-22.04

env:
ARCH_SPECIFIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.arch_specific_cpp_stdlib_path }}
GENERIC_CPP_STDLIB_PATH: ${{ needs.set-env.outputs.generic_cpp_stdlib_path }}
CACHE_KEY: ${{ needs.obtain_and_build_vsomeip.outputs.cache_key }}

steps:
Expand Down
23 changes: 12 additions & 11 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ serde_json = { version = "1.0.94" }
uuid = { version = "1.7.0" }
tokio = { version = "1.35.1", default-features = false, features = ["rt", "rt-multi-thread", "sync", "time"] }
protobuf = { version = "3.3", features = ["with-bytes"] }
up-rust = { version = "0.2.0", default-features = false }
up-transport-zenoh = { version = "0.3.0" }
up-transport-vsomeip = { git = "https://github.com/eclipse-uprotocol/up-transport-vsomeip-rust.git", tag = "v0.3.0", default-features = false }
up-transport-mqtt5 = { version = "0.1.0" }
up-rust = { version = "0.3.0", default-features = false }
up-transport-zenoh = { version = "0.4.0" }
up-transport-vsomeip = { version = "0.4.1", default-features = false }
up-transport-mqtt5 = { version = "0.2.0" }
zenoh = { version = "1.0.0", features = ["default", "plugins"] }
zenoh-core = { version = "1.0.0" }
zenoh-plugin-trait = { version = "1.0.0" }
Expand Down
Loading