Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resync master with develop #20

Merged
merged 6 commits into from
Nov 8, 2019
Merged

Resync master with develop #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a288d54
Update Dockerfile
itabrl Oct 16, 2019
2d2d042
update package
itabrl Oct 17, 2019
9d8b0ba
Merge pull request #17 from usdot-fhwa-stol/feature/update-version
maefromm Oct 17, 2019
58320f5
update version in dockerfile and config file
itabrl Oct 18, 2019
11ddc54
Merge pull request #19 from usdot-fhwa-stol/feature/skyline-version-u…
maefromm Oct 18, 2019
fd0158a
Merge pull request #18 from usdot-fhwa-stol/release/skyline
maefromm Oct 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
# Pull docker image from docker hub
# XTERM used for better catkin_make output
docker:
- image: usdotfhwastol/carma-base:3.1.0
- image: usdotfhwastol/carma-base:3.2.0
user: carma
environment:
TERM: xterm
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
# License for the specific language governing permissions and limitations under
# the License.

FROM usdotfhwastol/carma-base:3.0.0 as setup
FROM usdotfhwastol/carma-base:3.2.0 as setup

RUN mkdir ~/src
COPY --chown=carma . /home/carma/src/CARMAAvtVimbaDriver
RUN ~/src/CARMAAvtVimbaDriver/docker/checkout.sh
RUN ~/src/CARMAAvtVimbaDriver/docker/install.sh

FROM usdotfhwastol/carma-base:3.0.0
FROM usdotfhwastol/carma-base:3.2.0

ARG BUILD_DATE="NULL"
ARG VERSION="NULL"
Expand Down
2 changes: 1 addition & 1 deletion docker/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ if [[ -n ${1} ]]; then
dir=${1}
fi

git clone https://github.com/usdot-fhwa-stol/CARMAMsgs.git ${dir}/src/CARMAMsgs --branch Version_3.0.0 --depth 1
git clone https://github.com/usdot-fhwa-stol/CARMAMsgs.git ${dir}/src/CARMAMsgs --branch CARMASystem_3.1.0 --depth 1
2 changes: 1 addition & 1 deletion package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>avt_vimba_camera</name>
<version>0.0.10</version>
<version>1.0.0</version>
<description>Wrapper of the Allied Vision Technologies (AVT) VIMBA Ethernet and Firewire SDK.</description>

<maintainer email="miquel.massot@uib.cat">Miquel Massot</maintainer>
Expand Down