From 5dce1a5cb5a26ae0d9d9c5072cc528f08acad6db Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Wed, 30 Aug 2023 11:05:00 -0700 Subject: [PATCH] Update meta-files to "main" branch --- .docker/Dockerfile | 2 +- .github/workflows/docker.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index c85a3bb..0b66e1a 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -89,7 +89,7 @@ ARG WS_DIR=/home/$USERNAME/ros_ws WORKDIR ${WS_DIR}/src ARG ARENA_CAMERA_ROS2_REPO=https://github.com/apl-ocean-engineering/arena_camera_ros2.git -ARG ARENA_CAMERA_ROS2_BRANCH=master +ARG ARENA_CAMERA_ROS2_BRANCH=main RUN echo "Cloning from ${ARENA_CAMERA_ROS2_BRANCH} branch ${ARENA_CAMERA_ROS2_REPO}" # This will break cache when the repo changes diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 20a1a78..0742622 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -2,7 +2,7 @@ name: Build Docker Images on: push: - branches: [ master] + branches: [main] workflow_dispatch: pull_request: paths: