-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into attachment
- Loading branch information
Showing
168 changed files
with
2,851 additions
and
1,599 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,31 +15,24 @@ name: integration | |
|
||
on: | ||
push: | ||
branches: [ '**' ] | ||
branches: ["**"] | ||
pull_request: | ||
branches: [ '**' ] | ||
branches: ["**"] | ||
schedule: | ||
- cron: '0 6 * * 1-5' | ||
- cron: "0 6 * * 1-5" | ||
|
||
jobs: | ||
build: | ||
|
||
name: Build on ${{ matrix.os }} | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
os: [ ubuntu-latest, macOS-latest ] | ||
os: [ubuntu-latest, macOS-latest] | ||
|
||
steps: | ||
- uses: actions/checkout@v4 | ||
|
||
- name: Install latest stable | ||
uses: actions-rs/[email protected] | ||
with: | ||
toolchain: stable | ||
override: true | ||
components: rustfmt, clippy | ||
- name: Clone this repository | ||
uses: actions/checkout@v4 | ||
|
||
- name: Compile debug | ||
run: make all | ||
|
@@ -51,9 +44,10 @@ jobs: | |
|
||
- name: Test debug | ||
run: make test | ||
timeout-minutes: 15 | ||
env: | ||
BUILD_TYPE: Debug # Workaround for Windows as it seems the previous step is being ignored | ||
BUILD_TESTING: OFF # Workaround for Windows as it seems the previous step is being ignored | ||
BUILD_MULTICAST: OFF # Workaround for Windows as it seems the previous step is being ignored | ||
BUILD_TYPE: Debug # Workaround for Windows as it seems the previous step is being ignored | ||
BUILD_TESTING: OFF # Workaround for Windows as it seems the previous step is being ignored | ||
BUILD_MULTICAST: OFF # Workaround for Windows as it seems the previous step is being ignored | ||
BUILD_INTEGRATION: ON # Workaround for Windows as it seems the previous step is being ignored | ||
ZENOH_BRANCH: master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,7 +25,9 @@ jobs: | |
name: Preparation | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Clone this repository | ||
uses: actions/checkout@v4 | ||
|
||
- name: Environment setup | ||
id: env | ||
shell: bash | ||
|
@@ -34,32 +36,32 @@ jobs: | |
echo "GITHUB_SHA=${GITHUB_SHA:0:8}" | ||
GIT_BRANCH=`[[ $GITHUB_REF =~ ^refs/heads/.* ]] && echo ${GITHUB_REF/refs\/heads\//} || true` | ||
echo "GIT_BRANCH=${GIT_BRANCH}" | ||
echo ::set-output name=GIT_BRANCH::"${GIT_BRANCH}" | ||
echo "GIT_BRANCH=${GIT_BRANCH}" >> $GITHUB_OUTPUT | ||
GIT_TAG=`[[ $GITHUB_REF =~ ^refs/tags/.* ]] && echo ${GITHUB_REF/refs\/tags\//} || true` | ||
echo "GIT_TAG=${GIT_TAG}" | ||
echo ::set-output name=GIT_TAG::"${GIT_TAG}" | ||
echo "GIT_TAG=${GIT_TAG}" >> $GITHUB_OUTPUT | ||
ZENOH_VERSION=$(sed -n 's/^project(libzenohpico VERSION \(.*\) LANGUAGES C)/\1/p' CMakeLists.txt | head -n1) | ||
echo "ZENOH_VERSION=${ZENOH_VERSION}" | ||
echo ::set-output name=ZENOH_VERSION::"${ZENOH_VERSION}" | ||
echo "ZENOH_VERSION=${ZENOH_VERSION}" >> $GITHUB_OUTPUT | ||
if [ -n "${GIT_TAG}" ]; then | ||
IS_RELEASE="true" | ||
echo "IS_RELEASE=${IS_RELEASE}" | ||
echo ::set-output name=IS_RELEASE::"${IS_RELEASE}" | ||
echo "IS_RELEASE=${IS_RELEASE}" >> $GITHUB_OUTPUT | ||
PKG_VERSION=${GIT_TAG} | ||
elif [ -n "${GIT_BRANCH}" ]; then | ||
PKG_VERSION=${GIT_BRANCH}-${GITHUB_SHA:0:8} | ||
else | ||
PKG_VERSION=${ZENOH_VERSION}-${GITHUB_SHA:0:8} | ||
fi | ||
echo "PKG_VERSION=${PKG_VERSION}" | ||
echo ::set-output name=PKG_VERSION::"${PKG_VERSION}" | ||
echo "PKG_VERSION=${PKG_VERSION}" >> $GITHUB_OUTPUT | ||
CROSSBUILD_TARGETS=$(sed -n 's/^CROSSBUILD_TARGETS=\(.*\)/\1/p' GNUmakefile | head -n1) | ||
echo "CROSSBUILD_TARGETS=$CROSSBUILD_TARGETS" | ||
TARGET_MATRIX="{\"target\": [\"${CROSSBUILD_TARGETS// /\",\"}\"]}" | ||
echo "TARGET_MATRIX=$TARGET_MATRIX" | ||
echo ::set-output name=TARGET_MATRIX::"${TARGET_MATRIX}" | ||
echo "TARGET_MATRIX=$TARGET_MATRIX" >> $GITHUB_OUTPUT | ||
outputs: | ||
GIT_BRANCH: ${{ steps.env.outputs.GIT_BRANCH }} | ||
GIT_TAG: ${{ steps.env.outputs.GIT_TAG }} | ||
|
@@ -73,11 +75,14 @@ jobs: | |
needs: preps | ||
runs-on: macos-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Clone this repository | ||
uses: actions/checkout@v4 | ||
|
||
- name: MacOS build | ||
run: make | ||
env: | ||
BUILD_TYPE: RELEASE | ||
|
||
- name: Packaging | ||
id: package | ||
shell: bash | ||
|
@@ -86,14 +91,15 @@ jobs: | |
echo "Packaging ${LIB_PKG_NAME}:" | ||
cd build && zip -r ${LIB_PKG_NAME} lib && cd - | ||
zip -r ${LIB_PKG_NAME} include | ||
echo ::set-output name=LIB_PKG_NAME::"${LIB_PKG_NAME}" | ||
echo "LIB_PKG_NAME=${LIB_PKG_NAME}" >> $GITHUB_OUTPUT | ||
EXP_PKG_NAME=${PWD}/zenoh-pico-${{ needs.preps.outputs.PKG_VERSION }}-macos-x64-examples.zip | ||
echo "Packaging ${EXP_PKG_NAME}:" | ||
cd build/examples && zip ${EXP_PKG_NAME} * && cd - | ||
echo ::set-output name=EXP_PKG_NAME::"${EXP_PKG_NAME}" | ||
echo "EXP_PKG_NAME=${EXP_PKG_NAME}" >> $GITHUB_OUTPUT | ||
- name: "Upload x86_64 macos package" | ||
uses: actions/upload-artifact@master | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: macos-x64 | ||
path: | | ||
|
@@ -108,11 +114,14 @@ jobs: | |
fail-fast: false | ||
matrix: ${{fromJson(needs.preps.outputs.TARGET_MATRIX)}} | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Clone this repository | ||
uses: actions/checkout@v4 | ||
|
||
- name: make for ${{ matrix.target }} | ||
env: | ||
BUILD_TYPE: RELEASE | ||
run: make ${{ matrix.target }} | ||
|
||
- name: Packaging | ||
id: package | ||
shell: bash | ||
|
@@ -126,22 +135,23 @@ jobs: | |
echo "Packaging ${LIB_PKG_NAME}:" | ||
cd crossbuilds/${TARGET} && zip -r ${LIB_PKG_NAME} lib && cd - | ||
zip -r ${LIB_PKG_NAME} include | ||
echo ::set-output name=LIB_PKG_NAME::"${LIB_PKG_NAME}" | ||
echo "LIB_PKG_NAME=${LIB_PKG_NAME}" >> $GITHUB_OUTPUT | ||
cd crossbuilds/${TARGET}/packages | ||
echo "Packaging ${DEB_PKG_NAME}:" | ||
zip ${DEB_PKG_NAME} *.deb | ||
echo ::set-output name=DEB_PKG_NAME::"${DEB_PKG_NAME}" | ||
echo "DEB_PKG_NAME=${DEB_PKG_NAME}" >> $GITHUB_OUTPUT | ||
echo "Packaging ${RPM_PKG_NAME}:" | ||
zip ${RPM_PKG_NAME} *.rpm | ||
echo ::set-output name=RPM_PKG_NAME::"${RPM_PKG_NAME}" | ||
echo "RPM_PKG_NAME=${RPM_PKG_NAME}" >> $GITHUB_OUTPUT | ||
cd - | ||
echo "Packaging ${EXP_PKG_NAME}:" | ||
cd crossbuilds/${TARGET}/examples && zip ${EXP_PKG_NAME} * && cd - | ||
echo ::set-output name=EXP_PKG_NAME::"${EXP_PKG_NAME}" | ||
echo "EXP_PKG_NAME=${EXP_PKG_NAME}" >> $GITHUB_OUTPUT | ||
- name: "Upload packages" | ||
uses: actions/upload-artifact@master | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: ${{ matrix.target }} | ||
path: | | ||
|
@@ -157,13 +167,15 @@ jobs: | |
runs-on: ubuntu-latest | ||
steps: | ||
- name: Download result of previous builds | ||
uses: actions/download-artifact@v2 | ||
uses: actions/download-artifact@v3 | ||
with: | ||
path: ARTIFACTS | ||
|
||
- name: Publish as github release | ||
uses: softprops/action-gh-release@v1 | ||
with: | ||
files: ARTIFACTS/*/*.* | ||
|
||
- name: Publish to download.eclipse.org/zenoh | ||
env: | ||
SSH_TARGET: [email protected] | ||
|
Oops, something went wrong.