Skip to content

Commit

Permalink
iox-eclipse-iceoryx#583 Merge remote-tracking branch 'upstream/master…
Browse files Browse the repository at this point in the history
…' into iox-eclipse-iceoryx#583-clean-up-doxygen-in-dds

Signed-off-by: Hintz Martin (XC-AD/ESB5) <martin.hintz@de.bosch.com>
  • Loading branch information
marthtz committed May 3, 2021
2 parents 353df37 + 244d872 commit 884ddca
Show file tree
Hide file tree
Showing 631 changed files with 21,594 additions and 8,644 deletions.
2 changes: 1 addition & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Checks: '-*,readability-*,-readability-named-parameter,-readability-avoid-const-params-in-decls,-readability-else-after-return,performance-*,hicpp-*,-hicpp-named-parameter,-hicpp-avoid-c-arrays,cppcoreguidelines-*,-hicpp-no-array-decay,-hicpp-signed-bitwise,-cppcoreguidelines-avoid-c-arrays,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-array-to-pointer-decay, concurrency-*,clang-analyzer-*,cert-*,bugprone-*'
Checks: '-*,readability-*,-readability-named-parameter,-readability-avoid-const-params-in-decls,-readability-else-after-return,performance-*,hicpp-*,-hicpp-named-parameter,-hicpp-avoid-c-arrays,cppcoreguidelines-*,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-vararg,-cppcoreguidelines-avoid-c-arrays,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-type-vararg,concurrency-*,clang-analyzer-*,cert-*,bugprone-*'
CheckOptions:
- { key: readability-identifier-naming.ClassCase, value: CamelCase }
- { key: readability-identifier-naming.EnumCase, value: CamelCase }
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
branches: [ master, release* ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# This is a workflow that is manually triggered to generate a changelog based on given git tags and branch

name: Generate Changelog

on:
workflow_dispatch:
inputs:
BranchName:
description: 'Branch name to generate changelog'
required: true
UntilTag:
description: 'Until tag v[major].[minor].[patch].[dev]'
required: true
FutureRelease:
description: 'Future release version v[major].[minor].[patch].[dev]'
required: true

jobs:
create-release:
runs-on: ubuntu-latest

steps:
- name: Checkout branch
uses: actions/checkout@v2.3.4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
ref: ${{ github.event.inputs.BranchName }}
# Generate changelog
- name: Generate Changelog using github-changelog-generator
uses: heinrichreimer/github-changelog-generator-action@v2.1.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
project: iceoryx
user: eclipse-iceoryx
releaseBranch: ${{ github.event.inputs.BranchName }}
futureRelease: v${{ github.event.inputs.FutureRelease }}
dueTag: ${{ github.event.inputs.UntilTag }}
pullRequests: False
author: False
issues: True
issuesWoLabels: True
stripHeaders: True
stripGeneratorNotice: True
2 changes: 1 addition & 1 deletion .github/workflows/coverage_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
branches: [ master, release* ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/experimental_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
branches: [ master, release* ]

jobs:
build_job_latest_clang:
Expand Down Expand Up @@ -68,7 +68,6 @@ jobs:
uses: actions/checkout@v2

- name: Build sources
continue-on-error: true
run: |
sudo $GITHUB_WORKSPACE/tools/add_test_users.sh
$GITHUB_WORKSPACE/tools/iceoryx_build_test.sh build-all out-of-tree test-add-user
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/integrationtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
branches: [ master, release* ]

jobs:
build:
Expand Down Expand Up @@ -52,6 +52,7 @@ jobs:
run: |
source /opt/ros/foxy/setup.bash
cd $GITHUB_WORKSPACE
rm -rf iceoryx_examples/COLCON_IGNORE iceoryx_integrationtest/COLCON_IGNORE
colcon build
- name: Test Execution
Expand Down
77 changes: 77 additions & 0 deletions .github/workflows/release_build_publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# This workflow only runs manually to build an iceoryx release and publish it into an existing Github Release

name: iceoryx build & create release

on:
workflow_dispatch:
inputs:
ReleaseTag:
description: 'Git Tag to create v[major].[minor].[patch]'
required: true

jobs:
build-ubuntu-release:
if: github.actor == 'budrus' || github.actor == 'MatthiasKillat' || github.actor == 'mossmaurice' ||
github.actor == 'elfenpfiff' || github.actor == 'elboberido' || github.actor == 'marthtz' ||
github.actor == 'ariexi' || github.actor == 'ithier' || github.actor == 'dkroenke'
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-18.04]
steps:
- name: Install iceoryx dependencies
run: |
sudo apt-get update
sudo apt-get install -y libacl1-dev libncurses5-dev doxygen graphviz texlive-font-utils
sudo apt-get install -y plantuml texlive-latex-base texlive-latex-extra texlive-latex-recommended texlive-fonts-recommended
- name: Checkout
uses: actions/checkout@v2
with:
ref: ${{ github.event.inputs.ReleaseTag }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Build sources
run: |
$GITHUB_WORKSPACE/tools/iceoryx_build_test.sh build-strict build-all out-of-tree
- name: Run all tests
run: |
cd $GITHUB_WORKSPACE/build
tools/run_tests.sh all
- name: Build debian package
run: |
$GITHUB_WORKSPACE/tools/iceoryx_build_test.sh clean dds-gateway package
- name: Upload release artifacts
uses: actions/upload-artifact@v2
with:
name: release_artifacts
path: ./build_package/iceoryx*.deb

# This job must be put at the end to collect all release assets from the previous jobs
release:
name: Create Release
needs: build-ubuntu-release
runs-on: ubuntu-latest
steps:
- name: Download release artifacts
uses: actions/download-artifact@v2
with:
name: release_artifacts

- name: Create Release
id: create_release
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.event.inputs.ReleaseTag }}
name: Release ${{ github.event.inputs.ReleaseTag }}
draft: true
prerelease: true
files: |
./iceoryx*.deb
2 changes: 1 addition & 1 deletion .github/workflows/sanitize.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
branches: [ master, release* ]

jobs:
clang-sanitize:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ clangd/
*/doc/xml/
site/
doc/website/API-reference/
tools/website/generated/
*.project
__pycache__
Loading

0 comments on commit 884ddca

Please sign in to comment.