Skip to content

Commit

Permalink
Post-migration changes
Browse files Browse the repository at this point in the history
  • Loading branch information
hexbabe committed Aug 27, 2024
1 parent fc88722 commit 4ef5ccb
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .canon.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
viam-camera-realsense:
image_arm64: ghcr.io/viamrobotics/viam-camera-realsense:arm64
image_amd64: ghcr.io/viamrobotics/viam-camera-realsense:amd64
image_arm64: ghcr.io/viam-modules/viam-camera-realsense:arm64
image_amd64: ghcr.io/viam-modules/viam-camera-realsense:amd64
minimum_date: 2023-08-15T03:54:00.0Z
persistent: true
4 changes: 2 additions & 2 deletions .github/workflows/appimage-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
include:
- os: buildjet-8vcpu-ubuntu-2204-arm
container:
image: ghcr.io/viamrobotics/viam-camera-realsense:arm64
image: ghcr.io/viam-modules/viam-camera-realsense:arm64
options: --platform linux/arm64
make_target: appimage-arm64
platform: linux/arm64
- os: ubuntu-latest
container:
image: ghcr.io/viamrobotics/viam-camera-realsense:amd64
image: ghcr.io/viam-modules/viam-camera-realsense:amd64
options: --platform linux/amd64
make_target: appimage-amd64
platform: linux/amd64
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/appimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
include:
- os: 'buildjet-8vcpu-ubuntu-2204-arm'
container:
image: ghcr.io/viamrobotics/viam-camera-realsense:arm64
image: ghcr.io/viam-modules/viam-camera-realsense:arm64
options: '--platform linux/arm64'
make_target: appimage-arm64
- os: 'ubuntu-latest'
container:
image: ghcr.io/viamrobotics/viam-camera-realsense:amd64
image: ghcr.io/viam-modules/viam-camera-realsense:amd64
options: '--platform linux/amd64'
make_target: appimage-amd64

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
include:
- os: buildjet-8vcpu-ubuntu-2204-arm
container:
image: ghcr.io/viamrobotics/viam-camera-realsense:arm64
image: ghcr.io/viam-modules/viam-camera-realsense:arm64
options: --platform linux/arm64
make_target: integration-appimage-arm64
arch: arm64
- os: ubuntu-latest
container:
image: ghcr.io/viamrobotics/viam-camera-realsense:amd64
image: ghcr.io/viam-modules/viam-camera-realsense:amd64
options: --platform linux/amd64
make_target: integration-appimage-amd64
arch: amd64
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
include:
- os: buildjet-8vcpu-ubuntu-2204-arm
container:
image: ghcr.io/viamrobotics/viam-camera-realsense:arm64
image: ghcr.io/viam-modules/viam-camera-realsense:arm64
options: --platform linux/arm64
- os: ubuntu-latest
container:
image: ghcr.io/viamrobotics/viam-camera-realsense:amd64
image: ghcr.io/viam-modules/viam-camera-realsense:amd64
options: --platform linux/amd64

container: ${{ matrix.container }}
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25 FATAL_ERROR)

project(viam-camera-realsense
DESCRIPTION "Viam Module for the Intel RealSense Camera"
HOMEPAGE_URL https://github.com/viamrobotics/viam-camera-realsense
HOMEPAGE_URL https://github.com/viam-modules/viam-camera-realsense
LANGUAGES CXX
)
set(CMAKE_CXX_STANDARD 17)
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,22 @@ docker: docker-build docker-upload

docker-build: docker-arm64

docker-arm64: MAIN_TAG = ghcr.io/viamrobotics/viam-camera-realsense
docker-arm64: MAIN_TAG = ghcr.io/viam-modules/viam-camera-realsense
docker-arm64: BUILD_TAG = arm64
docker-arm64:
$(BUILD_CMD)

docker-upload:
docker push 'ghcr.io/viamrobotics/viam-camera-realsense:arm64'
docker push 'ghcr.io/viam-modules/viam-camera-realsense:arm64'

# CI targets that automatically push, avoid for local test-first-then-push workflows
docker-arm64-ci: MAIN_TAG = ghcr.io/viamrobotics/viam-camera-realsense
docker-arm64-ci: MAIN_TAG = ghcr.io/viam-modules/viam-camera-realsense
docker-arm64-ci: BUILD_TAG = arm64
docker-arm64-ci: BUILD_PUSH = --push
docker-arm64-ci:
$(BUILD_CMD)

docker-amd64-ci: MAIN_TAG = ghcr.io/viamrobotics/viam-camera-realsense
docker-amd64-ci: MAIN_TAG = ghcr.io/viam-modules/viam-camera-realsense
docker-amd64-ci: BUILD_TAG = amd64
docker-amd64-ci: BUILD_PUSH = --push
docker-amd64-ci:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ The binary takes one argument, which is the location to the module you would lik

If you would like to compile the integration tests yourself, you will need to compile the binary on the same machine you expect to run it on.

- Copy the repo to your local robot: `git clone https://github.com/viamrobotics/viam-camera-realsense.git`
- Copy the repo to your local robot: `git clone https://github.com/viam-modules/viam-camera-realsense.git`
- run `make realsense-integration-tests`
- run the tests with `./realsense-integration-tests -module /path/to/realsense/module`

Expand Down Expand Up @@ -157,8 +157,8 @@ You can also build it yourself using Docker and [Viam canon](https://github.com/
Use the commands

```
docker pull ghcr.io/viamrobotics/viam-camera-realsense:arm64
git clone https://github.com/viamrobotics/viam-camera-realsense/
docker pull ghcr.io/viam-modules/viam-camera-realsense:arm64
git clone https://github.com/viam-modules/viam-camera-realsense/
cd viam-camera-realsense/
canon -arch arm64 make appimage-arm64
```
Expand Down
14 changes: 7 additions & 7 deletions etc/Dockerfile.debian.bookworm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RUN apt-get -y --no-install-recommends install -t llvm-toolchain-bookworm-15 \

RUN mkdir -p /root/opt/src

# install Viam C++ SDK from source frozen at a commit
# Install Viam C++ SDK from source frozen at a commit
ENV PINNED_COMMIT_HASH="5461780d4a6bcab18ed4cba51be1de2feb76dddf"
RUN cd /root/opt/src && \
git clone https://github.com/viamrobotics/viam-cpp-sdk && \
Expand All @@ -59,7 +59,7 @@ RUN cd /root/opt/src && \
ninja install -j 4 && \
rm -rf /root/opt/src/viam-cpp-sdk

# install librealsense from source
# Install librealsense from source
RUN cd /root/opt/src && \
git clone https://github.com/IntelRealSense/librealsense.git && \
cd librealsense && \
Expand All @@ -70,7 +70,7 @@ RUN cd /root/opt/src && \
make install -j 4 && \
rm -rf /root/opt/src/librealsense

# install appimage-builder deps
# Install appimage-builder deps
RUN apt install -y \
binutils \
coreutils \
Expand All @@ -87,14 +87,14 @@ RUN apt install -y \

RUN pip3 install -U pip setuptools urllib3==1.26.12 requests==2.26.0 --break-system-packages

# install appimage-builder
# Install appimage-builder
RUN pip3 install --break-system-packages git+https://github.com/AppImageCrafters/appimage-builder.git@61c8ddde9ef44b85d7444bbe79d80b44a6a5576d

# install Go
# Install Go
RUN apt install -y golang-go

# necessary library for jpeg
# Necessary library for jpeg
RUN apt install -y libturbojpeg-dev

# install GTest
# Install GTest
RUN apt install -y libgtest-dev
2 changes: 1 addition & 1 deletion integration/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/viamrobotics/viam-camera-realsense/integration
module github.com/viam-modules/viam-camera-realsense/integration

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion integration/tests/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var modulePath = flag.String("module", "", "the path to the intel realsense modu

func TestMain(m *testing.M) {
fmt.Println("VIAM REALSENSE MODULE INTEGRATION TESTS")
fmt.Println("Tests defined at https://github.com/viamrobotics/viam-camera-realsense/tree/main/integration/tests")
fmt.Println("Tests defined at https://github.com/viam-modules/viam-camera-realsense/tree/main/integration/tests")
flag.Parse()
moduleString := strings.TrimSpace(*modulePath)
if moduleString == "" {
Expand Down

0 comments on commit 4ef5ccb

Please sign in to comment.