Skip to content

Commit b2b2594

Browse files
k-okadak-okada
committed
Imported upstream version '0.1.18' of 'upstream'
1 parent fec9037 commit b2b2594

Some content is hidden

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

53 files changed

+477
-90
lines changed

‎.github/workflows/config.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ jobs:
2525
CONTAINER: ubuntu:20.04
2626
# BUILD_PKGS: cmd_vel_smoother contact_states_observer joy_mouse jsk_teleop_joy
2727

28-
container: ${{ matrix.CONTAINER }}
28+
container:
29+
image: ${{ matrix.CONTAINER }}
30+
volumes:
31+
- /tmp/node20:/__e/node20
32+
2933
steps:
3034
- name: Install latest git ( use sudo for ros-ubuntu )
3135
run: |
@@ -48,6 +52,21 @@ jobs:
4852
git config --global --add safe.directory $GITHUB_WORKSPACE
4953
fi
5054
55+
- name: Try to replace `node` with an glibc 2.17
56+
shell: bash
57+
run: |
58+
if [ "${{ matrix.CONTAINER }}" = "jskrobotics/ros-ubuntu:14.04" ]; then
59+
export USER=$(whoami)
60+
sudo chmod 777 -R /__e/node20
61+
sudo chown -R $USER /__e/node20
62+
fi
63+
ls -lar /__e/node20 &&
64+
sudo apt-get install -y curl &&
65+
curl -Lo /tmp/node.tar.gz https://unofficial-builds.nodejs.org/download/release/v20.17.0/node-v20.17.0-linux-x64-glibc-217.tar.gz &&
66+
cd /__e/node20 &&
67+
tar -x --strip-components=1 -f /tmp/node.tar.gz &&
68+
ls -lar /__e/node20/bin/
69+
5170
- name: Chcekout
5271
uses: actions/checkout@v3.0.2
5372

‎.travis/.github/workflows/generate_action_config.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def main(sysargs):
2323

2424
for distro in distros:
2525
print("Generate {}.yml".format(distro))
26-
checkout = defaultdict(lambda: 'actions/checkout@v2',hydro='actions/checkout@v1')[distro]
26+
checkout = defaultdict(lambda: 'actions/checkout@v3.0.2',hydro='actions/checkout@v1')[distro]
2727
container = defaultdict(lambda: 'jskrobotics/ros-ubuntu:18.04',
2828
hydro = 'jskrobotics/ros-ubuntu:12.04',
2929
indigo = 'jskrobotics/ros-ubuntu:14.04',
@@ -43,7 +43,7 @@ def main(sysargs):
4343
container: %(container)s
4444
4545
steps:
46-
- name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
46+
- name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v3.0.2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
4747
run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
4848
- name: Before Checkout # need for actions/checkout with ros-ubuntu container
4949
run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
@@ -71,7 +71,7 @@ def main(sysargs):
7171
7272
steps:
7373
- name: Chcekout
74-
uses: actions/checkout@v2
74+
uses: actions/checkout@v3.0.2
7575
- name: Check Python3
7676
run: |
7777
apt update -q && apt install -y -q python3
@@ -93,7 +93,7 @@ def main(sysargs):
9393
9494
steps:
9595
- name: Chcekout
96-
uses: actions/checkout@v2
96+
uses: actions/checkout@v3.0.2
9797
- name: Check python2
9898
run: |
9999
apt update -q && apt install -y -q python2

‎.travis/.github/workflows/indigo.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,18 @@ jobs:
1414
container: jskrobotics/ros-ubuntu:14.04
1515

1616
steps:
17-
- name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
17+
- name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v3.0.2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
1818
run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
19-
- name: Before Checkout # need for actions/checkout with ros-ubuntu container
20-
run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
19+
- name: work around permission issue # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
20+
run: |
21+
set -x
22+
export USER=$(whoami)
23+
git config --global --add safe.directory $GITHUB_WORKSPACE || echo "OK" # Show 'could not lock config file /github/home/.gitconfig: Permission denied', but it is ok
24+
sudo mkdir -p /__w/
25+
sudo chmod 777 -R /__w/
26+
sudo chown -R $USER $HOME
2127
- name: Checkout
22-
uses: actions/checkout@v2
28+
uses: actions/checkout@v3.0.2
2329
- name: Run jsk_travis
2430
uses: ./
2531
with:

‎.travis/.github/workflows/kinetic.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,18 @@ jobs:
1414
container: jskrobotics/ros-ubuntu:16.04
1515

1616
steps:
17-
- name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
17+
- name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v3.0.2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
1818
run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
19-
- name: Before Checkout # need for actions/checkout with ros-ubuntu container
20-
run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
19+
- name: work around permission issue # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
20+
run: |
21+
set -x
22+
export USER=$(whoami)
23+
git config --global --add safe.directory $GITHUB_WORKSPACE || echo "OK" # Show 'could not lock config file /github/home/.gitconfig: Permission denied', but it is ok
24+
sudo mkdir -p /__w/
25+
sudo chmod 777 -R /__w/
26+
sudo chown -R $USER $HOME
2127
- name: Checkout
22-
uses: actions/checkout@v2
28+
uses: actions/checkout@v3.0.2
2329
- name: Run jsk_travis
2430
uses: ./
2531
with:

‎.travis/.github/workflows/main.yml

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
container: ubuntu:18.04
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v3.0.2
1616
with:
1717
fetch-depth: 2
1818
- name: Run jsk_travis
@@ -21,14 +21,15 @@ jobs:
2121
ADDITIONAL_ENV_TO_DOCKER: 'TEST_VAR1 TEST_VAR2'
2222
USE_JENKINS: true
2323
ROS_DISTRO : hydro
24+
TIMEOUT_JENKINS: 60
2425

2526
jenkins_indigo:
2627
name: jenkins_indigo
2728
runs-on: ubuntu-latest
2829
container: ubuntu:18.04
2930
steps:
3031
- name: Checkout
31-
uses: actions/checkout@v2
32+
uses: actions/checkout@v3.0.2
3233
with:
3334
fetch-depth: 2
3435
- name: Run jsk_travis
@@ -37,14 +38,15 @@ jobs:
3738
ADDITIONAL_ENV_TO_DOCKER: 'TEST_VAR1 TEST_VAR2'
3839
USE_JENKINS: true
3940
ROS_DISTRO : indigo
41+
TIMEOUT_JENKINS: 60
4042

4143
jenkins_kinetic:
4244
name: jenkins_kinetic
4345
runs-on: ubuntu-latest
4446
container: ubuntu:18.04
4547
steps:
4648
- name: Checkout
47-
uses: actions/checkout@v2
49+
uses: actions/checkout@v3.0.2
4850
with:
4951
fetch-depth: 2
5052
- name: Run jsk_travis
@@ -53,14 +55,15 @@ jobs:
5355
ADDITIONAL_ENV_TO_DOCKER: 'TEST_VAR1 TEST_VAR2'
5456
USE_JENKINS: true
5557
ROS_DISTRO : kinetic
58+
TIMEOUT_JENKINS: 60
5659

5760
jenkins_kinetic_pcl:
5861
name: jenkins_kinetic_pcl
5962
runs-on: ubuntu-latest
6063
container: ubuntu:18.04
6164
steps:
6265
- name: Checkout
63-
uses: actions/checkout@v2
66+
uses: actions/checkout@v3.0.2
6467
with:
6568
fetch-depth: 2
6669
- name: Run jsk_travis
@@ -70,14 +73,15 @@ jobs:
7073
USE_JENKINS: true
7174
ROS_DISTRO : kinetic
7275
DOCKER_IMAGE_JENKINS : ros-ubuntu:16.04-pcl
76+
TIMEOUT_JENKINS: 60
7377

7478
jenkins_melodic:
7579
name: jenkins_melodic
7680
runs-on: ubuntu-latest
7781
container: ubuntu:18.04
7882
steps:
7983
- name: Checkout
80-
uses: actions/checkout@v2
84+
uses: actions/checkout@v3.0.2
8185
with:
8286
fetch-depth: 2
8387
- name: Run jsk_travis
@@ -86,14 +90,15 @@ jobs:
8690
ADDITIONAL_ENV_TO_DOCKER: 'TEST_VAR1 TEST_VAR2'
8791
USE_JENKINS: true
8892
ROS_DISTRO : melodic
93+
TIMEOUT_JENKINS: 60
8994

9095
jenkins_melodic_pcl:
9196
name: jenkins_melodic_pcl
9297
runs-on: ubuntu-latest
9398
container: ubuntu:18.04
9499
steps:
95100
- name: Checkout
96-
uses: actions/checkout@v2
101+
uses: actions/checkout@v3.0.2
97102
with:
98103
fetch-depth: 2
99104
- name: Run jsk_travis
@@ -103,14 +108,15 @@ jobs:
103108
USE_JENKINS: true
104109
ROS_DISTRO : melodic
105110
DOCKER_IMAGE_JENKINS : ros-ubuntu:18.04-pcl
111+
TIMEOUT_JENKINS: 60
106112

107113
jenkins_noetic:
108114
name: jenkins_noetic
109115
runs-on: ubuntu-latest
110116
container: ubuntu:18.04
111117
steps:
112118
- name: Checkout
113-
uses: actions/checkout@v2
119+
uses: actions/checkout@v3.0.2
114120
with:
115121
fetch-depth: 2
116122
- name: Run jsk_travis
@@ -119,14 +125,15 @@ jobs:
119125
ADDITIONAL_ENV_TO_DOCKER: 'TEST_VAR1 TEST_VAR2'
120126
USE_JENKINS: true
121127
ROS_DISTRO : noetic
128+
TIMEOUT_JENKINS: 60
122129

123130
jenkins_noetic_pcl:
124131
name: jenkins_noetic_pcl
125132
runs-on: ubuntu-latest
126133
container: ubuntu:18.04
127134
steps:
128135
- name: Checkout
129-
uses: actions/checkout@v2
136+
uses: actions/checkout@v3.0.2
130137
with:
131138
fetch-depth: 2
132139
- name: Run jsk_travis
@@ -136,6 +143,7 @@ jobs:
136143
USE_JENKINS: true
137144
ROS_DISTRO : noetic
138145
DOCKER_IMAGE_JENKINS : ros-ubuntu:20.04-pcl
146+
TIMEOUT_JENKINS: 60
139147

140148
hydro:
141149
name: hydro
@@ -158,7 +166,7 @@ jobs:
158166
container: ubuntu:14.04
159167
steps:
160168
- name: Checkout
161-
uses: actions/checkout@v2
169+
uses: actions/checkout@v3.0.2
162170
with:
163171
fetch-depth: 2
164172
- name: Run jsk_travis
@@ -173,7 +181,7 @@ jobs:
173181
container: ubuntu:16.04
174182
steps:
175183
- name: Checkout
176-
uses: actions/checkout@v2
184+
uses: actions/checkout@v3.0.2
177185
with:
178186
fetch-depth: 2
179187
- name: Run jsk_travis
@@ -188,7 +196,7 @@ jobs:
188196
container: ubuntu:18.04
189197
steps:
190198
- name: Checkout
191-
uses: actions/checkout@v2
199+
uses: actions/checkout@v3.0.2
192200
with:
193201
fetch-depth: 2
194202
- name: Run jsk_travis
@@ -203,7 +211,7 @@ jobs:
203211
container: ubuntu:18.04
204212
steps:
205213
- name: Checkout
206-
uses: actions/checkout@v2
214+
uses: actions/checkout@v3.0.2
207215
with:
208216
fetch-depth: 2
209217
- name: Run jsk_travis
@@ -221,7 +229,7 @@ jobs:
221229
container : ubuntu:18.04
222230
steps:
223231
- name: Checkout
224-
uses: actions/checkout@v2
232+
uses: actions/checkout@v3.0.2
225233
with:
226234
fetch-depth: 2
227235
- name: Run jsk_travis
@@ -237,7 +245,7 @@ jobs:
237245
container : ubuntu:18.04
238246
steps:
239247
- name: Checkout
240-
uses: actions/checkout@v2
248+
uses: actions/checkout@v3.0.2
241249
with:
242250
fetch-depth: 2
243251
- name: Run jsk_travis
@@ -255,7 +263,7 @@ jobs:
255263
container : ubuntu:18.04
256264
steps:
257265
- name: Checkout
258-
uses: actions/checkout@v2
266+
uses: actions/checkout@v3.0.2
259267
with:
260268
fetch-depth: 2
261269
- name: Add pr2eus repository to .travis.rosinstall
@@ -280,7 +288,7 @@ jobs:
280288
container : ubuntu:20.04
281289
steps:
282290
- name: Checkout
283-
uses: actions/checkout@v2
291+
uses: actions/checkout@v3.0.2
284292
with:
285293
fetch-depth: 2
286294
- name: Run jsk_travis
@@ -295,7 +303,7 @@ jobs:
295303
container : ubuntu:20.04
296304
steps:
297305
- name: Checkout
298-
uses: actions/checkout@v2
306+
uses: actions/checkout@v3.0.2
299307
with:
300308
fetch-depth: 2
301309
- name: Run jsk_travis
@@ -314,7 +322,7 @@ jobs:
314322
container: ubuntu:20.04
315323
steps:
316324
- name: Checkout
317-
uses: actions/checkout@v2
325+
uses: actions/checkout@v3.0.2
318326
with:
319327
fetch-depth: 2
320328
- name: Run jsk_travis
@@ -332,7 +340,7 @@ jobs:
332340
- name: Before Checkout # need for actoins/checkout with ros-ubuntu container
333341
run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
334342
- name: Checkout
335-
uses: actions/checkout@v2
343+
uses: actions/checkout@v3.0.2
336344
- name: Run jsk_travis
337345
uses: ./
338346
with:
@@ -347,7 +355,7 @@ jobs:
347355
- name: Before Checkout # need for actoins/checkout with ros-ubuntu container
348356
run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
349357
- name: Checkout
350-
uses: actions/checkout@v2
358+
uses: actions/checkout@v3.0.2
351359
with:
352360
fetch-depth: 2
353361
- name: Run jsk_travis
@@ -361,10 +369,16 @@ jobs:
361369
runs-on: ubuntu-latest
362370
container: jskrobotics/ros-ubuntu:20.04
363371
steps:
364-
- name: Before Checkout # need for actoins/checkout with ros-ubuntu container
365-
run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
372+
- name: work around permission issue # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
373+
run: |
374+
set -x
375+
export USER=$(whoami)
376+
git config --global --add safe.directory $GITHUB_WORKSPACE || echo "OK" # Show 'could not lock config file /github/home/.gitconfig: Permission denied', but it is ok
377+
sudo mkdir -p /__w/
378+
sudo chmod 777 -R /__w/
379+
sudo chown -R $USER $HOME
366380
- name: Checkout
367-
uses: actions/checkout@v2
381+
uses: actions/checkout@v3.0.2
368382
with:
369383
fetch-depth: 2
370384
- name: Run jsk_travis
@@ -378,7 +392,7 @@ jobs:
378392
runs-on: ubuntu-latest
379393
steps:
380394
- name: Checkout
381-
uses: actions/checkout@v2
395+
uses: actions/checkout@v3.0.2
382396
with:
383397
fetch-depth: 2
384398
- name: Check python3

0 commit comments

Comments
 (0)