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

Jump to bottom

Setup-MSBuild Compatibility #321

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Setup-MSBuild Compatibility #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions .github/actions/build-and-test/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 'build-and-test'
runs:
using: "composite"
steps:
- run: |
npm install -g codecov
npm ci
npm run build
npm test
shell: bash
# Upload code coverage to CodeCov, but do not fail the CI if CodeCov upload
# fails as the service is sometimes flaky.
- run: codecov -f ./coverage/coverage-final.json || true
shell: bash
12 changes: 0 additions & 12 deletions .github/workflows/build-and-test.sh
View file
Open in desktop

This file was deleted.

32 changes: 26 additions & 6 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: '12.x'
- run: .github/workflows/build-and-test.sh
- uses: ./.github/actions/build-and-test
- uses: ros-tooling/setup-ros@0.0.25
with:
required-ros-distributions: ${{ matrix.ros_distribution }}
Expand All @@ -74,7 +74,7 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: '12.x'
- run: .github/workflows/build-and-test.sh
- uses: ./.github/actions/build-and-test
- uses: ros-tooling/setup-ros@0.0.25
with:
required-ros-distributions: ${{ matrix.ros_distribution }}
Expand Down Expand Up @@ -105,7 +105,6 @@ jobs:
target-ros2-distro: foxy
vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test_cpp_with_dependency.repos"


test_ros2_docker:
name: "ROS 2 Docker"
runs-on: ubuntu-latest
Expand Down Expand Up @@ -141,7 +140,7 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: '12.x'
- run: .github/workflows/build-and-test.sh
- uses: ./.github/actions/build-and-test
- uses: ros-tooling/setup-ros@0.0.25
with:
required-ros-distributions: ${{ matrix.ros_distribution }}
Expand Down Expand Up @@ -174,12 +173,33 @@ jobs:
matrix:
os: [macOS-latest, windows-latest, ubuntu-20.04]
ros_distribution: [foxy, rolling]
shell: [bash, pwsh, sh, powershell, cmd]
vs-version: [null, 14, 15, 16]
exclude:
- {os: windows-latest, shell: sh}
- {os: macOS-latest, shell: powershell}
- {os: macOS-latest, shell: cmd}
- {os: macOS-latest, vs-version: 14}
- {os: macOS-latest, vs-version: 15}
- {os: macOS-latest, vs-version: 16}
- {os: ubuntu-20.04, shell: powershell}
- {os: ubuntu-20.04, shell: cmd}
- {os: ubuntu-20.04, vs-version: 14}
- {os: ubuntu-20.04, vs-version: 15}
- {os: ubuntu-20.04, vs-version: 16}
defaults:
run:
shell: ${{matrix.shell}}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: '12.x'
- run: .github/workflows/build-and-test.sh
- if: matrix.vs-version
uses: microsoft/setup-msbuild@v1
with:
vs-version: ${{ matrix.vs-version }}
- uses: ./.github/actions/build-and-test
- uses: ros-tooling/setup-ros@0.0.25
- uses: ./
id: test_single_package
Expand Down Expand Up @@ -300,7 +320,7 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: '12.x'
- run: .github/workflows/build-and-test.sh
- uses: ./.github/actions/build-and-test
- uses: ros-tooling/setup-ros@0.0.25
with:
required-ros-distributions: ${{ matrix.ros_distribution }}
Expand Down
Loading