mirror of
https://github.com/hermitcore/libhermit.git
synced 2025-03-09 00:00:03 +01:00
Merge branch 'master' into devel
This commit is contained in:
commit
14d96bfc5b
3 changed files with 23 additions and 12 deletions
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"package": {
|
||||
"name": "libhermit",
|
||||
"repo": "ubuntu",
|
||||
"repo": "REPLACE_REPO",
|
||||
"subject": "hermitcore",
|
||||
"website_url": "http://www.hermitcore.org",
|
||||
"issue_tracker_url": "https://github.com/RWTH-OS/HermitCore/issues",
|
||||
|
@ -23,7 +23,7 @@
|
|||
{
|
||||
"includePattern": "../(libhermit[^/]*.deb$)", "uploadPattern": "$1",
|
||||
"matrixParams": {
|
||||
"deb_distribution": "bionic",
|
||||
"deb_distribution": "REPLACE_OS",
|
||||
"deb_component": "main",
|
||||
"deb_architecture": "amd64",
|
||||
"override": 1}
|
||||
|
|
22
.travis.yml
22
.travis.yml
|
@ -4,6 +4,7 @@ git:
|
|||
submodules: true
|
||||
env:
|
||||
matrix:
|
||||
- OS_TYPE=debian OS_VERSION=9 OS_NAME=stretch
|
||||
- OS_TYPE=ubuntu OS_VERSION=18.04 OS_NAME=bionic
|
||||
services:
|
||||
- docker
|
||||
|
@ -19,6 +20,8 @@ script:
|
|||
before_deploy:
|
||||
- cd ${TRAVIS_BUILD_DIR}
|
||||
- dpkg-deb -b tmp libhermit-0.2.9-all.deb
|
||||
- sed -i "s/REPLACE_REPO/$OS_TYPE/" .bintray_descriptor.json
|
||||
- sed -i "s/REPLACE_OS/$OS_NAME/" .bintray_descriptor.json
|
||||
deploy:
|
||||
provider: bintray
|
||||
on:
|
||||
|
@ -31,11 +34,14 @@ deploy:
|
|||
secure: fg8+5owyDFPt3H/+Xk8jGHtEBasz1C2K0i+z92f/JnjTyLCrrKn+6DX7VRgcEl4ketTWLex7JduJLl4/7Ftug8qN0NuMwx0OxDCrwzvkoVwbl2DYX8von9ceuuV57p4e+uG35bPjU7E1KblkL+7ERqn9hsp5NbVdb4ueoSl9LedDdfzwcz8iA8JmzpbJ5RwQqg4kmdvuRVEUZMbQeHq4KB3kTznsma3BUeApVSaRQ8BpSaHED0tzFWKUTdjq7GvjBMF6WNpVIsc7Usky78UUyjaGbfMyT/7i9RctC3rAXr2XZryxDrJstAnHo6trqraf/3E40a7r0LhF9y7HWdmlfG99qhT3Vii3/pHeRIDp5O6xpIF8o/QkbYaFTwcvefRCjRQ8YYREqYvYnXOsKge/VaoUx48pTn6fOPzEzvlbyTkJ6Wp7knhx4qzR5JB8yTbIjoozggrkayvkYVfdMZjXvY/2T8TcNbPG0+0+EVkUcNrNMy9ksAH4RgR+eVQ4oI/sg5ldnVpp74jhSSDgAHBKCZQ01tIYMMEIyZm7qhAAdXnjCeV6D78a8/brUN+TSRNGYILx4vTiY3GMLEHsDGH4VEGawef0CtQasBrt5Cc0a/3KDNwuBy8rlbxLxbv+JCCn9vMm+UYQ6sTexsih76V07OHmQliu0xjQgBG5maFaV74=
|
||||
|
||||
after_deploy:
|
||||
- docker login -u $DOCKER_USER -p $DOCKER_PASS
|
||||
- export REPO=rwthos/hermitcore
|
||||
- export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi`
|
||||
- cd ${TRAVIS_BUILD_DIR}/docker
|
||||
- docker build -f Dockerfile -t $REPO .
|
||||
- docker tag $REPO $REPO:$TAG
|
||||
- docker tag $REPO $REPO:travis-$TRAVIS_BUILD_NUMBER
|
||||
- docker push $REPO
|
||||
- |
|
||||
if [ "$OS_TYPE" == "ubuntu" ]; then
|
||||
docker login -u $DOCKER_USER -p $DOCKER_PASS
|
||||
export REPO=rwthos/hermitcore
|
||||
export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi`
|
||||
cd ${TRAVIS_BUILD_DIR}/docker
|
||||
docker build -f Dockerfile -t $REPO .
|
||||
docker tag $REPO $REPO:$TAG
|
||||
docker tag $REPO $REPO:travis-$TRAVIS_BUILD_NUMBER
|
||||
docker push $REPO
|
||||
fi
|
||||
|
|
9
tests.sh
9
tests.sh
|
@ -34,15 +34,17 @@ export DEBIAN_FRONTEND="noninteractive"
|
|||
apt-get -qq update
|
||||
apt-get install -y qemu-system-x86 cmake wget curl gnupg checkinstall gawk dialog apt-utils flex bison binutils texinfo gcc g++ libmpfr-dev libmpc-dev libgmp-dev libisl-dev packaging-dev build-essential libtool autotools-dev autoconf pkg-config apt-transport-https nasm rpm
|
||||
|
||||
echo "deb [trusted=yes] https://dl.bintray.com/hermitcore/ubuntu bionic main" | tee -a /etc/apt/sources.list
|
||||
echo "deb [trusted=yes] https://dl.bintray.com/hermitcore/$OS_NAME $OS_VERSION main" | tee -a /etc/apt/sources.list
|
||||
apt-get -qq update
|
||||
apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit #gcc-hermit-bootstrap
|
||||
apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit
|
||||
#apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit-bootstrap
|
||||
export PATH=/opt/hermit/bin:$PATH
|
||||
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit -DBOOTSTRAP=true ..
|
||||
make hermit-bootstrap
|
||||
#checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=libhermit --pkgversion=0.2.9 --pkglicense=BSD make hermit-bootstrap-install
|
||||
make hermit-bootstrap-install
|
||||
rm -rf *
|
||||
cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit ..
|
||||
|
@ -51,8 +53,11 @@ make -j1 package
|
|||
cd ..
|
||||
mkdir -p tmp
|
||||
dpkg-deb -R build/libhermit-0.2.9-all.deb tmp
|
||||
#dpkg-deb -R build/libhermit_0.2.9-1_amd64.deb tmp
|
||||
rm -rf build/*.deb build/_CPack_Packages
|
||||
|
||||
#exit 0
|
||||
|
||||
fi
|
||||
|
||||
TDIR=/work/build/local_prefix/opt/hermit/x86_64-hermit/extra
|
||||
|
|
Loading…
Add table
Reference in a new issue