Skip to content

Commit b309ae1

Browse files
marinagmoreiramarinagmoreira
authored
Merge pull request #89 from nasa/develop
Release 0.2.6
2 parents 3a7bdca + d8bc94c commit b309ae1

File tree

206 files changed

+13598
-1971
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+13598
-1971
lines changed

‎.catkin_tools/CATKIN_IGNORE‎

Whitespace-only changes.

‎.catkin_tools/README‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎.catkin_tools/VERSION‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.catkin_tools/profiles/cross/config.yaml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.catkin_tools/profiles/default/config.yaml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.github/workflows/apk.yaml‎

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33
name: Compile APK
44

5-
on: ['push', 'pull_request']
5+
on: ['push', 'pull_request', 'workflow_dispatch']
66

77
jobs:
88
install_dependencies:
9-
runs-on: ubuntu-18.04
9+
runs-on: ubuntu-20.04
1010

1111
steps:
1212
- name: Checkout Astrobee
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
1414
with:
1515
repository: nasa/astrobee
1616
path: astrobee/
1717

1818
- name: Checkout ISAAC
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020
with:
2121
submodules: recursive
2222
path: isaac/
@@ -36,36 +36,9 @@ jobs:
3636
--build-arg PYTHON=''
3737
-t isaac/isaac:msgs-ubuntu16.04
3838

39-
- name: Build image isaac/isaac:latest-msgs-jar-ubuntu16.04
40-
run: docker build isaac -f isaac/scripts/docker/build_msgs_jar.Dockerfile
39+
- name: Build image isaac/isaac:latest-akp-ubuntu16.04
40+
run: docker build isaac -f isaac/scripts/docker/build_apk.Dockerfile
4141
--build-arg UBUNTU_VERSION=16.04
4242
--build-arg ROS_VERSION=kinetic
4343
--build-arg PYTHON=''
44-
-t isaac/isaac:latest-msgs-jar-ubuntu16.04
45-
46-
- name: Copy jar files
47-
run: |
48-
docker cp $(docker create --rm isaac/isaac:latest-msgs-jar-ubuntu16.04):/src/msgs/devel/share/maven/ .
49-
rm isaac/apks/isaac_gs_ros_bridge/app/libs/*msgs*
50-
find maven -name *.jar -print0 | xargs -0 cp -t isaac/apks/isaac_gs_ros_bridge/app/libs
51-
52-
- name: Install APK dependencies
53-
run: |
54-
sudo apt-get install -y libc6-dev-i386 lib32z1 openjdk-8-jdk
55-
mkdir $HOME/android-sdk
56-
cd $HOME/android-sdk
57-
wget https://dl.google.com/android/repository/tools_r25.2.3-linux.zip
58-
java -version
59-
unzip tools_r25.2.3-linux.zip
60-
tools/bin/sdkmanager --update
61-
yes | tools/bin/sdkmanager "platforms;android-25" "build-tools;25.0.2" "extras;google;m2repository" "extras;android;m2repository"
62-
wget https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip
63-
unzip android-ndk-r22b-linux-x86_64.zip
64-
mv android-ndk-r22b ndk-bundle
65-
cd ~/android-sdk/ndk-bundle/toolchains
66-
ln -s aarch64-linux-android-4.9 mips64el-linux-android
67-
ln -s arm-linux-androideabi-4.9 mipsel-linux-android
68-
- name: Build APK
69-
run: |
70-
cd isaac/apks/isaac_gs_ros_bridge
71-
ANDROID_HOME=$HOME/android-sdk ANDROID_NDK_HOME=$HOME/android-sdk/ndk-bundle ./gradlew build
44+
-t isaac/isaac:latest-apk-ubuntu16.04

‎.github/workflows/ci_pr.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@ name: Build and Test CI for Pull Requests
33
on:
44
pull_request:
55
branches: [ 'master', 'develop' ]
6+
workflow_dispatch:
67

78
jobs:
89

910
build-xenial:
1011

11-
runs-on: ubuntu-18.04
12+
runs-on: ubuntu-20.04
1213

1314
steps:
1415

1516
- name: Checkout Astrobee
16-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1718
with:
1819
repository: nasa/astrobee
1920
path: astrobee/
2021

2122
- name: Checkout ISAAC
22-
uses: actions/checkout@v2
23+
uses: actions/checkout@v3
2324
with:
2425
submodules: recursive
2526
path: isaac/
@@ -53,18 +54,18 @@ jobs:
5354
-t isaac/isaac:msgs-ubuntu16.04
5455
build-bionic:
5556

56-
runs-on: ubuntu-18.04
57+
runs-on: ubuntu-20.04
5758

5859
steps:
5960

6061
- name: Checkout Astrobee
61-
uses: actions/checkout@v2
62+
uses: actions/checkout@v3
6263
with:
6364
repository: nasa/astrobee
6465
path: astrobee/
6566

6667
- name: Checkout ISAAC
67-
uses: actions/checkout@v2
68+
uses: actions/checkout@v3
6869
with:
6970
submodules: recursive
7071
path: isaac/
@@ -104,13 +105,13 @@ jobs:
104105
steps:
105106

106107
- name: Checkout Astrobee
107-
uses: actions/checkout@v2
108+
uses: actions/checkout@v3
108109
with:
109110
repository: nasa/astrobee
110111
path: astrobee/
111112

112113
- name: Checkout ISAAC
113-
uses: actions/checkout@v2
114+
uses: actions/checkout@v3
114115
with:
115116
submodules: recursive
116117
path: isaac/
@@ -146,4 +147,4 @@ jobs:
146147

147148
- name: Build analyst image isaac/isaac:msgs-ubuntu20.04
148149
run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile
149-
-t isaac/isaac_analyst_notebook:latest
150+
-t isaac/isaac_analyst_notebook:latest

‎.github/workflows/ci_push.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,25 @@ name: Build, test and push packages CI
33
on:
44
push:
55
branches: [ 'develop' ]
6+
workflow_dispatch:
7+
branches: [ 'develop' ]
68

79
jobs:
810

911
build-xenial:
1012

11-
runs-on: ubuntu-18.04
13+
runs-on: ubuntu-20.04
1214

1315
steps:
1416

1517
- name: Checkout Astrobee
16-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1719
with:
1820
repository: nasa/astrobee
1921
path: astrobee/
2022

2123
- name: Checkout ISAAC
22-
uses: actions/checkout@v2
24+
uses: actions/checkout@v3
2325
with:
2426
submodules: recursive
2527
path: isaac/
@@ -67,18 +69,18 @@ jobs:
6769
6870
build-bionic:
6971

70-
runs-on: ubuntu-18.04
72+
runs-on: ubuntu-20.04
7173

7274
steps:
7375

7476
- name: Checkout Astrobee
75-
uses: actions/checkout@v2
77+
uses: actions/checkout@v3
7678
with:
7779
repository: nasa/astrobee
7880
path: astrobee/
7981

8082
- name: Checkout ISAAC
81-
uses: actions/checkout@v2
83+
uses: actions/checkout@v3
8284
with:
8385
submodules: recursive
8486
path: isaac/
@@ -131,13 +133,13 @@ jobs:
131133
steps:
132134

133135
- name: Checkout Astrobee
134-
uses: actions/checkout@v2
136+
uses: actions/checkout@v3
135137
with:
136138
repository: nasa/astrobee
137139
path: astrobee/
138140

139141
- name: Checkout ISAAC
140-
uses: actions/checkout@v2
142+
uses: actions/checkout@v3
141143
with:
142144
submodules: recursive
143145
path: isaac/

‎.github/workflows/ci_release.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ name: Build, test and push packages CI
33
on:
44
push:
55
branches: [ 'master' ]
6+
workflow_dispatch:
7+
branches: [ 'master' ]
68

79
jobs:
810

911
build-xenial:
1012

11-
runs-on: ubuntu-18.04
13+
runs-on: ubuntu-20.04
1214

1315
steps:
14-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1517

1618
- name: Checkout submodule
1719
run: git submodule update --init --depth 1 isaac_msgs
@@ -45,10 +47,10 @@ jobs:
4547
4648
build-bionic:
4749

48-
runs-on: ubuntu-18.04
50+
runs-on: ubuntu-20.04
4951

5052
steps:
51-
- uses: actions/checkout@v2
53+
- uses: actions/checkout@v3
5254

5355
- name: Checkout submodule
5456
run: git submodule update --init --depth 1 isaac_msgs
@@ -85,7 +87,7 @@ jobs:
8587
runs-on: ubuntu-20.04
8688

8789
steps:
88-
- uses: actions/checkout@v2
90+
- uses: actions/checkout@v3
8991

9092
- name: Checkout submodule
9193
run: git submodule update --init --depth 1 isaac_msgs

‎.github/workflows/docs.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@ name: Build and Push Documentation to gh-pages Branch
55
on:
66
push:
77
branches: ['develop']
8+
workflow_dispatch:
9+
branches: ['develop']
810

911
jobs:
1012
build_and_push_docs:
11-
runs-on: ubuntu-18.04
13+
runs-on: ubuntu-20.04
1214

1315
steps:
1416
- name: Checkout
15-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1618
with:
1719
path: repo/
1820
- name: Checkout gh-pages
19-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2022
with:
2123
path: docs/
2224
ref: gh-pages

0 commit comments

Comments
 (0)