Skip to content

Commit

Permalink
Half-way syncing with nasa ros1 develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ana-GT committed Dec 12, 2024
2 parents 9b154a7 + e03d2f8 commit 1ced1cd
Show file tree
Hide file tree
Showing 887 changed files with 40,037 additions and 17,787 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@
],
"workspaceMount": "source=${localWorkspaceFolder},target=/src/astrobee/src,type=bind",
"workspaceFolder": "/src/astrobee/src"
}
}
31 changes: 31 additions & 0 deletions .devcontainer/remote/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
ARG UBUNTU_VERSION=20.04
ARG REMOTE=ghcr.io/nasa
FROM ${REMOTE}/astrobee:latest-ubuntu${UBUNTU_VERSION}
ENV DEBIAN_FRONTEND=dialog

# Rationale for packages:
# xvfb: X server that doesn't need GPU or physical display
# x11vnc: VNC server that shares xvfb display with external VNC clients
# xfce4: lightweight window manager
# dbus-x11: inter-process communication needed by xfce
# x11-apps: X11 apps to demo such as xeyes
# x11-utils: debugging commands such as xdpyinfo
# x11-xserver-utils: setup commands such as xset

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
dbus-x11 \
x11-apps \
x11-utils \
x11-xserver-utils \
x11vnc \
xfce4 \
xvfb \
&& rm -rf /var/lib/apt/lists/*

RUN ls -l

CMD ["/src/astrobee/src/scripts/start_vnc.sh"]

# Expose VNC server's port
EXPOSE 5900
26 changes: 26 additions & 0 deletions .devcontainer/remote/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"dockerFile": "Dockerfile",
"build": {
"args": {
"WORKSPACE": "${containerWorkspaceFolder}"
}
},
"remoteUser": "root",
"overrideCommand": false,
"forwardPorts": [
5900
],
"runArgs": [
"-ti",
"--rm",
"--cap-add=SYS_PTRACE",
"--security-opt=seccomp:unconfined",
"--security-opt=apparmor:unconfined"
],
"containerEnv": {
"DISPLAY": ":0",
"LIBGL_ALWAYS_SOFTWARE": "1" // Needed for software rendering of opengl
},
"workspaceMount": "source=${localWorkspaceFolder},target=/src/astrobee/src,type=bind",
"workspaceFolder": "/src/astrobee/src"
}
32 changes: 0 additions & 32 deletions .github/workflows/ci_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,6 @@ on:

jobs:

build-xenial:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Build, test
run: ./scripts/docker/build.sh --xenial --remote
astrobee test_astrobee

build-bionic:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Build, test
run: ./scripts/docker/build.sh --bionic --remote
astrobee test_astrobee

build-focal:

runs-on: ubuntu-20.04
Expand Down
64 changes: 24 additions & 40 deletions .github/workflows/ci_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,12 @@ name: Build, test and push packages CI

on:
push:
branches: [ 'develop' ]
branches-ignore:
- gh-pages
- ros2

jobs:

build-xenial:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin

- name: Build, test, push docker
run: ./scripts/docker/build.sh --xenial --remote
--owner ${{ github.repository_owner }}
astrobee test_astrobee push_astrobee

build-bionic:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin

- name: Build, test, push docker
run: ./scripts/docker/build.sh --bionic --remote
--owner ${{ github.repository_owner }}
astrobee test_astrobee push_astrobee

build-focal:

runs-on: ubuntu-20.04
Expand All @@ -56,6 +22,24 @@ jobs:
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin

- name: Build, test, push docker
run: ./scripts/docker/build.sh --focal --remote
--owner ${{ github.repository_owner }}
astrobee test_astrobee push_astrobee
run: >
revision="latest";
build_arg="astrobee";
push_arg="";
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}};
if [ "${{ github.repository_owner }}" == "nasa" ]; then
if [ $branch == "develop" ]; then
push_arg="push_astrobee";
fi;
if [ $branch == "master" ]; then
export VERSION=`grep -w -m 1 "Release" RELEASE.md | awk '{print $3}'`;
revision="v${VERSION}";
build_arg="astrobee_base astrobee";
push_arg="push_astrobee_base push_astrobee";
fi;
fi;
command="./scripts/docker/build.sh --focal --remote --revision ${revision} \
--owner ${{ github.repository_owner }} \
${build_arg} test_astrobee ${push_arg}";
echo "$command";
eval "$command";
82 changes: 0 additions & 82 deletions .github/workflows/ci_release.yml

This file was deleted.

36 changes: 0 additions & 36 deletions .github/workflows/docker_push_latest_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,6 @@ on: ['workflow_dispatch']

jobs:

build-xenial:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin

- name: Build base, build, test, push base docker
run: ./scripts/docker/build.sh --xenial
--owner ${{ github.repository_owner }}
astrobee_base astrobee test_astrobee push_astrobee_base

build-bionic:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin

- name: Build base, build, test, push base docker
run: ./scripts/docker/build.sh --bionic
--owner ${{ github.repository_owner }}
astrobee_base astrobee test_astrobee push_astrobee_base

build-focal:

runs-on: ubuntu-20.04
Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/msgs_jar.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Check for lint error and auto correct them

name: Build jar messages

on: ['push', 'pull_request']

jobs:
build-jar-msgs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3

- name: Build image astrobee/astrobee:msgs-ubuntu20.04
run: docker build . -f ./scripts/docker/astrobee_msgs.Dockerfile
-t astrobee/astrobee:msgs-ubuntu20.04

- name: Build image astrobee/astrobee:latest-msgs-jar-ubuntu20.04
run: docker build . -f ./scripts/docker/build_msgs_jar.Dockerfile
-t ghcr.io/${{ github.repository_owner }}/astrobee:latest-msgs-jar

- name: Copy jar files
run: |
docker cp $(docker create --rm ghcr.io/${{ github.repository_owner }}/astrobee:latest-msgs-jar):/src/msgs/devel/share/maven/ .
find maven -name *.jar
- name: Upload .jar messages artifact
if: ${{ github.event_name == 'push' }}
uses: actions/upload-artifact@v3
with:
name: jar-msgs
path: maven/**/*.jar

- name: Log in to registry
run: |
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
- name: Push Docker image if master or develop
run: >
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}};
if [[ "${{ github.repository_owner }}" == "nasa" ]]; then
if [[ $branch == "develop" ]]; then
docker push ghcr.io/${{ github.repository_owner }}/astrobee:latest-msgs-jar;
fi;
if [[ $branch == "master" ]]; then
export VERSION=`grep -w -m 1 "Release" RELEASE.md | awk '{print $3}'`;
docker tag ghcr.io/${{ github.repository_owner }}/astrobee:latest-msgs-jar ghcr.io/${{ github.repository_owner }}/astrobee:v${VERSION}-msgs-jar
docker push ghcr.io/${{ github.repository_owner }}/astrobee:v${VERSION}-msgs-jar;
fi;
fi;
2 changes: 1 addition & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# added to a new folder, you can auto-update it by running
# scripts/git/configure_isort_paths.sh.

src_paths = doc/scripts,hardware/eps_driver/tools,hardware/pico_driver/scripts,hardware/pmc_actuator/tools,localization/localization_common,localization/localization_common/scripts/localization_common,localization/marker_tracking/tools/marker_tracking_node,localization/sparse_mapping/scripts,localization/sparse_mapping/tools,scripts/build,scripts/calibrate,scripts/debug,scripts/git,scripts/postprocessing/coverage_analysis,tools/bag_processing/scripts,tools/bag_processing/scripts/utilities,tools/bag_processing/test,tools/calibration/scripts,tools/gds_helper/src,tools/gnc_visualizer/dds,tools/gnc_visualizer/scripts,tools/gnc_visualizer/scripts/communications,tools/localization_analysis/scripts,tools/performance_tester/scripts
src_paths = doc/scripts,hardware/eps_driver/tools,hardware/pico_driver/scripts,hardware/pmc_actuator/tools,localization/camera/test,localization/localization_common,localization/localization_common/scripts/localization_common,localization/marker_tracking/tools/marker_tracking_node,localization/sparse_mapping/scripts,localization/sparse_mapping/tools,scripts/build,scripts/calibrate,scripts/debug,scripts/git,scripts/postprocessing/coverage_analysis,tools/bag_processing,tools/bag_processing/scripts,tools/bag_processing/scripts/utilities,tools/bag_processing/src/bag_processing,tools/bag_processing/src/bag_processing/bak,tools/bag_processing/test,tools/calibration/scripts,tools/gds_helper/src,tools/gnc_visualizer/dds,tools/gnc_visualizer/scripts,tools/gnc_visualizer/scripts/communications,tools/localization_analysis/scripts,tools/performance_tester/scripts
Loading

0 comments on commit 1ced1cd

Please sign in to comment.