Skip to content

Commit

Permalink
update windows build; added python formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
admercs committed Feb 21, 2024
1 parent c992dae commit 70cb37d
Show file tree
Hide file tree
Showing 32 changed files with 826 additions and 354 deletions.
6 changes: 5 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,26 @@ about: Create a report to help us improve
<!-- Incomplete reports will lead to closing the issue. -->
<!-- Also, please test using the latest main branch make sure your issue has not already been fixed -->

## Bug report
## Bug report

<!-- If any section does not apply, replace its contents with "N/A". -->
- AutonomySim Version/#commit:
- Unreal Engine version:
- Autopilot system version:
- Operating system version:

### What's the issue you encountered?

<!-- Describe the issue in detail and what you were doing beforehand. -->
<!-- Attach screenshot if applicable. -->

### Settings

<!-- If not the default, include the settings.json file you are using -->
<!-- If it's too large, you can create a [gist](https://gist.github.com/) and past the link here. -->

### How can the issue be reproduced?

<!-- Include a detailed step by step process for recreating your issue. -->
<!-- If your issue includes code, create a [gist](https://gist.github.com/) and past the link here. -->

Expand Down
8 changes: 6 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@ about: Suggest an idea for this project
<!-- Please search existing issues to avoid creating duplicates. -->

## What feature are you suggesting?

### Overview:

<!-- Describe the feature you'd like. -->

### Smaller Details:
### Smaller Details:

<!-- These may include specific methods of implementation etc. -->

### Nature of Request:
### Nature of Request:

<!-- Remove all that do not apply to your request. -->
- Addition
- Change
Expand Down
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@ about: Your question may be moved to https://github.com/nervosys/AutonomySim/dis
<!-- Add clear and concise title -->

## Question

### What's your question?

<!-- Describe your question in detail. -->

### Include context on what you are trying to achieve

<!-- If any section does not apply, replace its contents with "N/A". -->

#### Context details

<!-- Add OS, AutonomySim version, Python version, Unreal version if applicable -->
<!-- If not the default, include the settings.json file you are using -->
<!-- If it's too large, you can create a [gist](https://gist.github.com/) and past the link here. -->
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/test_docs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
name: "Build and Deploy: Documentation (Doxygen, Sphinx, MkDocs)"

on: [push, pull_request, workflow_dispatch]
on:
push:
branches:
- master
pull_request:
branches:
- master
types: [opened, synchronize, reopened, closed]
# workflow_dispatch:

jobs:
build-deploy-docs:
Expand Down
40 changes: 36 additions & 4 deletions .github/workflows/test_formatting.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
name: "Test: C/C++ Source Formatting (clang-format)"
---
#----------------------------------------------------------------------------------------
# FILENAME:
# test_formatting.yml
# DESCRIPTION:
# GitHub Actions configuration for clang-format.
# AUTHOR:
# Adam Erickson (Nervosys)
# DATE:
# 2024-02-20
# NOTES:
#
# Copyright © 2024 Nervosys, LLC
#----------------------------------------------------------------------------------------

on: [push, pull_request]
name: "Test: Source Code Formatting"

on:
push:
branches:
- master
pull_request:
branches:
- master
types: [opened, synchronize, reopened, closed]
# workflow_dispatch:

jobs:
test-formatting:
name: Formatting Check
test-formatting-cpp:
name: "Test C/C++ Formatting"
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -44,3 +67,12 @@ jobs:
check-path: ${{ matrix.path['check'] }}
exclude-regex: ${{ matrix.path['exclude'] }}
fallback-style: "LLVM" # optional
test-formatting-python:
name: "Test Python Code Formatting"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: "Run autopep8 style check."
uses: peter-evans/autopep8@v2
with:
args: --recursive --in-place --aggressive --aggressive ./python/
33 changes: 29 additions & 4 deletions .github/workflows/test_macos.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,44 @@
---
#----------------------------------------------------------------------------------------
# FILENAME:
# test_macos.yml
# DESCRIPTION:
# GitHub Actions configuration for macOS.
# AUTHOR:
# Adam Erickson (Nervosys)
# DATE:
# 2024-02-20
# NOTES:
# - Homebrew is installed by default.
#
# Copyright © 2024 Nervosys, LLC
#----------------------------------------------------------------------------------------

name: "Build: macOS"

on: [push, pull_request, workflow_dispatch] # triggers
on:
push:
branches:
- master
pull_request:
branches:
- master
types: [opened, synchronize, reopened, closed]
# workflow_dispatch:

jobs:
build-macos:
runs-on: ${{ matrix.os }} # macos-latest
strategy:
matrix:
os: [macos-11, macos-12, macos-13, macos-14] # versions: [11: Big Sur, 12: Monterey, 13: Ventura, 14: Sonoma]

# Steps represent a sequence of tasks that will be executed as part of the job
# arch:
# - amd64
# - arm64
steps:
- uses: actions/checkout@v4

- name: "Install BASH (newer macOS versions use Zsh by default)"
- name: "Install BASH (macOS version > 10.14 uses Zsh by default)"
run: brew install bash

- name: "Remove Python 3 for Python 3.11 symbolic link"
Expand Down
31 changes: 26 additions & 5 deletions .github/workflows/test_ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
---
#----------------------------------------------------------------------------------------
# FILENAME:
# test_linux.yml
# DESCRIPTION:
# GitHub Actions configuration for Linux.
# AUTHOR:
# Adam Erickson (Nervosys)
# DATE:
# 2024-02-20
# NOTES:
#
# Copyright © 2024 Nervosys, LLC
#----------------------------------------------------------------------------------------

name: "Build: Linux"

on: [push, pull_request, workflow_dispatch]
on:
push:
branches:
- master
pull_request:
branches:
- master
types: [opened, synchronize, reopened, closed]
# workflow_dispatch:

jobs:
build-ubuntu:
Expand All @@ -11,8 +34,6 @@ jobs:
arch:
- amd64
# - arm64

# sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v4

Expand All @@ -24,8 +45,8 @@ jobs:
shell: bash
run: ./scripts/build.sh

- name: "Build ROS2 wrapper"
# if: matrix.os == 'ubuntu-20.04'
- name: "Build ROS2 Wrapper"
# if: ${{ matrix.os == 'ubuntu-20.04' }}
shell: bash
run: |
bash ./scripts/install_ros2_deps.sh
Expand Down
48 changes: 36 additions & 12 deletions .github/workflows/test_windows.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
---
#----------------------------------------------------------------------------------------
# FILENAME:
# test_windows.yml
# DESCRIPTION:
# GitHub Actions configuration for Windows.
# AUTHOR:
# Adam Erickson (Nervosys)
# DATE:
# 2024-02-20
# NOTES:
# - Requires Visual Studio 2022 Build Tools v143 (windows-2022)?
#
# Copyright © 2024 Nervosys, LLC
#----------------------------------------------------------------------------------------

name: "Build: Windows"

on:
Expand All @@ -8,34 +24,42 @@ on:
branches:
- master
types: [opened, synchronize, reopened, closed]
# workflow_dispatch:

jobs:
build-windows:
runs-on: ${{ matrix.os }} # windows-latest
strategy:
matrix:
# NOTE: Requires Visual Studio 2022 Build Tools v143 (windows-2022)
os: [windows-2022] # versions: [2019: 10, 2022: 11]
arch:
- amd64
# - arm64
steps:
- uses: actions/checkout@v4
- name: "Add MSBuild to PATH"
uses: microsoft/setup-msbuild@v2

# - name: "Add MSBuild to PATH"
# uses: microsoft/setup-msbuild@v2

# - name: "Enable Developer Command Prompt for Visual Studio"
# uses: ilammy/msvc-dev-cmd@v1
# - name: "Enable Developer Command Prompt for Visual Studio 2019"
# if: ${{ matrix.os == 'windows-2019' }}
# shell: pwsh
# run: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\Launch-VsDevShell.ps1'
# - name: "Enable Developer Command Prompt for Visual Studio 2022"
# if: ${{ matrix.os == 'windows-2022' }}
# shell: pwsh
# run: 'C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1'

- name: "Activate Developer PowerShell for Visual Studio 2019"
if: ${{ matrix.os == 'windows-2019' }}
shell: pwsh
run: |
'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\Launch-VsDevShell.ps1'
$CMAKE_GENERATOR_PLATFORM = 'Visual Studio 16 2019'
- name: "Activate Developer PowerShell for Visual Studio 2022"
if: ${{ matrix.os == 'windows-2022' }}
shell: pwsh
run: |
'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1'
$CMAKE_GENERATOR_PLATFORM = 'Visual Studio 17 2022'
- name: "Build AutonomySim"
shell: pwsh
run: |
# Set-PSDebug -Trace 1
# $CMAKE_GENERATOR_PLATFORM = 'Visual Studio 17 2022'
.\scripts\build.ps1 -BuildMode 'Release' -IntegrateDeploy
2 changes: 1 addition & 1 deletion cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(AutonomySim)

add_subdirectory("AutonomyLib")
add_subdirectory("AutonomyLibUnitTests")
add_subdirectory("rpclib_wrapper")
add_subdirectory("RpcLibWrapper")
add_subdirectory("MavLinkCom")
add_subdirectory("HelloCar")
add_subdirectory("HelloDrone")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5.0)
project(rpclib_wrapper)
project(RpcLibWrapper)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake-modules")
include("${CMAKE_CURRENT_LIST_DIR}/../cmake-modules/CommonSetup.cmake")
Expand Down
Loading

0 comments on commit 70cb37d

Please sign in to comment.