Skip to content

Commit

Permalink
Differentiate Debug vs. Release in scrape_vs.pl
Browse files Browse the repository at this point in the history
Should fix OpenDDS#4531

I think this used to work somewhat, but I think was more by accident.
Also separated CMake builds from `build_and_test.yml`.
  • Loading branch information
iguessthislldo committed Mar 25, 2024
1 parent 08a2763 commit 191c1dc
Show file tree
Hide file tree
Showing 7 changed files with 529 additions and 341 deletions.
304 changes: 1 addition & 303 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Build & Test"
name: "MPC Builds"

on:
push:
Expand Down Expand Up @@ -13681,305 +13681,3 @@ jobs:
with:
name: ${{ github.job }}_artifact
path: ${{ github.job }}.tar.xz

build_cmake_u22:

runs-on: ubuntu-22.04

steps:
- name: Checkout OpenDDS
uses: actions/checkout@v4
with:
path: OpenDDS
submodules: true
- name: Checkout MPC
uses: actions/checkout@v4
with:
repository: DOCGroup/MPC
path: MPC
- name: Checkout ACE/TAO
uses: actions/checkout@v4
with:
repository: DOCGroup/ACE_TAO
path: OpenDDS/build/ACE_TAO
- name: Install xerces
run: sudo apt-get -y install libxerces-c-dev
- name: Configure
run: |
cd OpenDDS
cmake -B build \
-DCMAKE_UNITY_BUILD=TRUE \
-DBUILD_SHARED_LIBS=TRUE \
-DCMAKE_BUILD_TYPE=Debug \
-DOPENDDS_SECURITY=TRUE \
-DOPENDDS_ACE_TAO_SRC=$GITHUB_WORKSPACE/OpenDDS/build/ACE_TAO \
-DOPENDDS_MPC=$GITHUB_WORKSPACE/MPC \
-DOPENDDS_BUILD_TESTS=TRUE \
-DOPENDDS_CMAKE_VERBOSE=all
- uses: ammaraskar/[email protected]
- name: Build
run: |
cd OpenDDS
cmake --build build -- -j $(getconf _NPROCESSORS_ONLN)
- name: Run Tests
run: |
cd OpenDDS/build
ctest
build_cmake_u22_stat:

runs-on: ubuntu-22.04

steps:
- name: Checkout OpenDDS
uses: actions/checkout@v4
with:
path: OpenDDS
submodules: true
- name: Checkout MPC
uses: actions/checkout@v4
with:
repository: DOCGroup/MPC
path: MPC
- name: Checkout ACE/TAO
uses: actions/checkout@v4
with:
repository: DOCGroup/ACE_TAO
path: OpenDDS/build/ACE_TAO
- name: Configure
run: |
cd OpenDDS
cmake -B build \
-DCMAKE_UNITY_BUILD=TRUE \
-DBUILD_SHARED_LIBS=FALSE \
-DCMAKE_BUILD_TYPE=Debug \
-DOPENDDS_ACE_TAO_SRC=$GITHUB_WORKSPACE/OpenDDS/build/ACE_TAO \
-DOPENDDS_MPC=$GITHUB_WORKSPACE/MPC \
-DOPENDDS_BUILD_TESTS=TRUE \
-DOPENDDS_CMAKE_VERBOSE=all
- uses: ammaraskar/[email protected]
- name: Build
run: |
cd OpenDDS
cmake --build build -- -j $(getconf _NPROCESSORS_ONLN)
- name: Run Tests
run: |
cd OpenDDS/build
ctest
build_cmake_u22_no_features:

runs-on: ubuntu-22.04

steps:
- name: Checkout OpenDDS
uses: actions/checkout@v4
with:
path: OpenDDS
submodules: true
- name: Checkout MPC
uses: actions/checkout@v4
with:
repository: DOCGroup/MPC
path: MPC
- name: Checkout ACE/TAO
uses: actions/checkout@v4
with:
repository: DOCGroup/ACE_TAO
path: OpenDDS/build/ACE_TAO
- name: Install Ninja
run: sudo apt-get -y install ninja-build
- name: Configure
run: |
cd OpenDDS
cmake -B build \
-G Ninja \
-DCMAKE_UNITY_BUILD=TRUE \
-DBUILD_SHARED_LIBS=TRUE \
-DCMAKE_BUILD_TYPE=Debug \
-DOPENDDS_ACE_TAO_SRC=$GITHUB_WORKSPACE/OpenDDS/build/ACE_TAO \
-DOPENDDS_MPC=$GITHUB_WORKSPACE/MPC \
-DOPENDDS_BUILD_TESTS=TRUE \
-DOPENDDS_BUILT_IN_TOPICS=FALSE \
-DOPENDDS_OBJECT_MODEL_PROFILE=FALSE \
-DOPENDDS_PERSISTENCE_PROFILE=FALSE \
-DOPENDDS_OWNERSHIP_PROFILE=FALSE \
-DOPENDDS_CONTENT_SUBSCRIPTION=FALSE \
-DOPENDDS_CMAKE_VERBOSE=all
- uses: ammaraskar/[email protected]
- name: Build
run: |
cd OpenDDS
cmake --build build
- name: Run Tests
run: |
cd OpenDDS/build
ctest
build_cmake_u22_android29:

runs-on: ubuntu-22.04

steps:
- name: Checkout OpenDDS
uses: actions/checkout@v4
with:
path: OpenDDS
submodules: true
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r25c
add-to-path: false
- name: Checkout MPC
uses: actions/checkout@v4
with:
repository: DOCGroup/MPC
path: MPC
- name: Checkout ACE/TAO
uses: actions/checkout@v4
with:
repository: DOCGroup/ACE_TAO
path: OpenDDS/build/ACE_TAO
- name: Install Ninja
run: sudo apt-get -y install ninja-build
- name: Configure Host Tools
run: |
cd OpenDDS
cmake -B build-host \
-G Ninja \
-DBUILD_SHARED_LIBS=FALSE \
-DOPENDDS_JUST_BUILD_HOST_TOOLS=TRUE
- uses: ammaraskar/[email protected]
- name: Build Host Tools
run: |
cd OpenDDS
cmake --build build-host
- name: Configure Target
run: |
cd OpenDDS
cmake -B build-target \
-G Ninja \
-DBUILD_SHARED_LIBS=TRUE \
-DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=android-29 \
--toolchain ${{ steps.setup-ndk.outputs.ndk-path }}/build/cmake/android.toolchain.cmake \
-DOPENDDS_CMAKE_VERBOSE=all \
-DOPENDDS_HOST_TOOLS=$(realpath build-host)
- name: Build Target
run: |
cd OpenDDS
cmake --build build-target
build_cmake_w22:

runs-on: windows-2022

needs: ACE_TAO_w22_p1

steps:
- name: setup for run-vcpkg
shell: bash
run: |
echo '{ "name": "opendds", "version-string": "github-actions", "dependencies": [ "openssl", "xerces-c" ] }' > vcpkg.json
- name: install openssl & xerces-c
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: '${{ env.VCPKG_GIT_COMMIT }}'
runVcpkgInstall: true
- name: Checkout OpenDDS
uses: actions/checkout@v4
with:
path: OpenDDS
submodules: true
- name: Checkout MPC
uses: actions/checkout@v4
with:
repository: DOCGroup/MPC
path: MPC
- name: Checkout ACE_TAO
uses: actions/checkout@v4
with:
repository: DOCGroup/ACE_TAO
ref: ace6tao2
path: OpenDDS/ACE_TAO
- name: Download ACE_TAO artifact
uses: actions/download-artifact@v4
with:
name: ACE_TAO_w22_p1_artifact
path: OpenDDS/ACE_TAO
- name: Extract ACE_TAO artifact
shell: bash
run: |
cd OpenDDS/ACE_TAO
tar xvfJ ACE_TAO_w22_p1.tar.xz
rm -f ACE_TAO_w22_p1.tar.xz
- name: set up msvc env
uses: ilammy/msvc-dev-cmd@v1
- name: Configure
shell: cmd
run: |
cd OpenDDS
cmake -B build^
-DBUILD_SHARED_LIBS=TRUE^
-DCMAKE_BUILD_TYPE=Debug^
-DOPENDDS_ACE=${{ github.workspace }}\OpenDDS\ACE_TAO\ACE^
-DOPENDDS_MPC=${{ github.workspace }}\MPC^
-DOPENDDS_BUILD_TESTS=TRUE^
-DOPENDDS_CMAKE_VERBOSE=all
- uses: ammaraskar/[email protected]
- name: Build
shell: cmd
run: |
cd OpenDDS
cmake --build build
- name: Run Tests
shell: cmd
run: |
cd OpenDDS\build
ctest -C Debug
build_cmake_w22_stat:

runs-on: windows-2022

steps:
- name: Checkout OpenDDS
uses: actions/checkout@v4
with:
path: OpenDDS
submodules: true
- name: Checkout MPC
uses: actions/checkout@v4
with:
repository: DOCGroup/MPC
path: MPC
- name: Checkout ACE/TAO
uses: actions/checkout@v4
with:
repository: DOCGroup/ACE_TAO
path: OpenDDS/build/ACE_TAO
- name: set up msvc env
uses: ilammy/msvc-dev-cmd@v1
- name: Configure
shell: cmd
run: |
cd OpenDDS
cmake -B build^
-DCMAKE_UNITY_BUILD=TRUE^
-DBUILD_SHARED_LIBS=FALSE^
-DCMAKE_BUILD_TYPE=Debug^
-DOPENDDS_ACE_TAO_SRC=${{ github.workspace }}\OpenDDS\build\ACE_TAO^
-DOPENDDS_MPC=${{ github.workspace }}\MPC^
-DOPENDDS_BUILD_TESTS=TRUE^
-DOPENDDS_CMAKE_VERBOSE=all
- uses: ammaraskar/[email protected]
- name: Build
shell: cmd
run: |
cd OpenDDS
cmake --build build
- name: Run Tests
shell: cmd
run: |
cd OpenDDS\build
ctest -C Debug
Loading

0 comments on commit 191c1dc

Please sign in to comment.