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

[RSDK-7953] Consolidate build workflow for all archs part 2 #48

Merged
merged 10 commits into from
Sep 16, 2024
Merged

[RSDK-7953] Consolidate build workflow for all archs part 2 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b9a89bb
sigh
hexbabe Sep 13, 2024
60b8583
Eliminate FFMPEG dep
hexbabe Sep 13, 2024
57fad97
Switch runner conditional now that we're using canon
hexbabe Sep 13, 2024
bd1ef35
Use canon antique profile throughout
hexbabe Sep 13, 2024
5446ba3
Pin canon; Use matrix for canon command and runner
hexbabe Sep 13, 2024
7123c91
Organize
hexbabe Sep 13, 2024
90775eb
Use ubuntu-latest for android
hexbabe Sep 13, 2024
eed795d
Don't use canon for android
hexbabe Sep 13, 2024
5299e17
Revert to normal mergeable state
hexbabe Sep 13, 2024
f8f440f
Fix integration test trigger
hexbabe Sep 13, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Integration test using mediamtx

on: [push, pull_request]
on: push
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This causes the workflow to run twice. Just need push here


jobs:
build-and-test:
Expand Down
33 changes: 24 additions & 9 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,21 @@ jobs:
publish:
strategy:
matrix:
platform: [linux/amd64, linux/arm64, android/arm64]

runs-on: ${{ matrix.platform == 'linux/arm64' && 'buildjet-8vcpu-ubuntu-2204-arm' || 'ubuntu-latest' }}
include:
- platform: linux/amd64
runner: ubuntu-latest
target_os: linux
target_arch: amd64
- platform: linux/arm64
runner: buildjet-8vcpu-ubuntu-2204-arm
target_os: linux
target_arch: arm64
- platform: android/arm64
runner: ubuntu-latest
target_os: android
target_arch: arm64

runs-on: ${{ matrix.runner }}

steps:
- uses: actions/checkout@v3
Expand All @@ -20,15 +32,18 @@ jobs:
with:
go-version: 1.21.13

- name: Install canon (only for non-Android platforms)
if: ${{ matrix.target_os != 'android' }}
run: |
export PATH="$(go env GOPATH)/bin:$PATH"
go install github.com/viamrobotics/[email protected]

- name: Build and package
run: |
if [[ "${{ matrix.platform }}" == "linux/amd64" ]]; then
TARGET_OS=linux TARGET_ARCH=amd64 make module
elif [[ "${{ matrix.platform }}" == "linux/arm64" ]]; then
TARGET_OS=linux TARGET_ARCH=arm64 make module
elif [[ "${{ matrix.platform }}" == "android/arm64" ]]; then
TARGET_OS=android TARGET_ARCH=arm64 make module
if [ "${{ matrix.target_os }}" != "android" ]; then
canon --profile viam-rtsp-antique
fi
TARGET_OS=${{ matrix.target_os }} TARGET_ARCH=${{ matrix.target_arch }} make module

- name: Upload viamrtsp module to registry
uses: viamrobotics/upload-module@main
Expand Down
Loading