Skip to content

Update build scripts #104

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

Merged
ethomson merged 2 commits into from
Oct 16, 2019
Merged

Update build scripts #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14c033f
build: exit on build failures
ethomson Oct 16, 2019
55210cc
linux-x64, rhel-x64: use a newer cmake
ethomson Oct 16, 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
4 changes: 3 additions & 1 deletion Dockerfile.linux-x64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ FROM ubuntu:14.04
WORKDIR /nativebinaries
COPY . /nativebinaries/

RUN apt update && apt -y install cmake libssl-dev pkg-config
RUN apt update && apt -y install libssl-dev pkg-config curl make gcc build-essential
Copy link
Member

@bording bording Oct 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, why did you remove the old cmake from being installed here, but didn't alter it in the same way for the rhel-x64 file?

Copy link
Member Author

@ethomson ethomson Oct 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oversight.


RUN curl -L https://github.com/Kitware/CMake/releases/download/v3.15.4/cmake-3.15.4-Linux-x86_64.sh -o /tmp/cmake.sh && bash /tmp/cmake.sh --skip-license --prefix=/usr/local

CMD ["/bin/bash", "-c", "./build.libgit2.sh"]
1 change: 1 addition & 0 deletions Dockerfile.rhel-x64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ WORKDIR /nativebinaries
COPY . /nativebinaries/

RUN yum -y install cmake gcc make openssl-devel
RUN curl -L https://github.com/Kitware/CMake/releases/download/v3.15.4/cmake-3.15.4-Linux-x86_64.sh -o /tmp/cmake.sh && bash /tmp/cmake.sh --skip-license --prefix=/usr/local

CMD ["/bin/bash", "-c", "./build.libgit2.sh"]
4 changes: 2 additions & 2 deletions build.libgit2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -e

LIBGIT2SHA=`cat ./nuget.package/libgit2/libgit2_hash.txt`
SHORTSHA=${LIBGIT2SHA:0:7}

Expand Down Expand Up @@ -50,5 +52,3 @@ rm -rf $PACKAGEPATH/$RID
mkdir -p $PACKAGEPATH/$RID/native

cp libgit2/build/libgit2-$SHORTSHA.$LIBEXT $PACKAGEPATH/$RID/native

exit $?
2 changes: 2 additions & 0 deletions dockerbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -e

docker build -t $RID -f Dockerfile.$RID .

docker run -it -e RID=$RID --name=$RID $RID
Expand Down