Skip to content

Commit 3cff147

Browse files
authored
Merge pull request #726 from k-okada/fix_ga
.github/workflows/config.yml: use checkout v3.0.2 and skip X for 14.04
2 parents 4d45a0d + 66af97e commit 3cff147

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,14 @@ jobs:
125125
git config --global --add safe.directory $GITHUB_WORKSPACE
126126
fi
127127
128-
- name: Chcekout
129-
uses: actions/checkout@v2
128+
- name: Checkout
129+
uses: actions/checkout@v3.0.2
130130

131131
- name: Start X server
132132
if: ${{ matrix.ROS_DISTRO == 'kinetic' && matrix.TEST_PKGS == 'pr2eus pr2eus_moveit' }}
133133

134134
run: |
135+
if [[ "${{ matrix.CONTAINER }}" =~ "jskrobotics/ros-ubuntu:14.04" ]]; then exit 0; fi
135136
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections || echo "failing on ros-ubuntu is OK" # set non interactive tzdata https://stackoverflow.com/questions/8671308/non-interactive-method-for-dpkg-reconfigure-tzdata
136137
sudo apt-get -y -qq install mesa-utils x11-xserver-utils xserver-xorg-video-dummy wget
137138
export DISPLAY=:0
@@ -140,6 +141,7 @@ jobs:
140141
sleep 3 # wait x server up
141142
export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI
142143
xhost +local:root
144+
shell: bash
143145

144146
- name: Fix geneus source tree
145147
run: |

0 commit comments

Comments
 (0)