yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-30 07:05:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge changes from master

Browse source
This commit is contained in:
vadym 2021-09-13 15:55:21 +03:00
parent e7de29eb62
commit f0714ff52f
7 changed files with 75 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.circleci/config.yml
View file

@ -73,7 +73,7 @@ jobs:
- run:
name: Build for Linux (RPM packages)
command: |
git clone https://github.com/RiV-chain/mesh-package-rpm ~/rpmbuild/SPECS
git clone https://github.com/RiV-chain/RiV-mesh-package-rpm ~/rpmbuild/SPECS
cd ../ && tar -czvf ~/rpmbuild/SOURCES/v$CIVERSIONRPM --transform "s/project/RiV-mesh-$CIBRANCH-$CIVERSIONRPM/" project
sed -i "s/RiV-mesh/RiV-mesh-$CIBRANCH/" ~/rpmbuild/SPECS/mesh.spec
sed -i "s/^PKGNAME=mesh/PKGNAME=mesh-$CIBRANCH/" ~/rpmbuild/SPECS/mesh.spec
@ -90,12 +90,12 @@ jobs:
name: Build for EdgeRouter and VyOS
command: |
rm -f {mesh,meshctl}
git clone https://github.com/neilalexander/vyatta-mesh /tmp/vyatta-mesh;
git clone https://github.com/RiV-chain/vyatta-mesh /tmp/vyatta-mesh;
cd /tmp/vyatta-mesh;
BUILDDIR_YGG=$CIRCLE_WORKING_DIRECTORY ./build-edgerouter-x $CIRCLE_BRANCH;
BUILDDIR_YGG=$CIRCLE_WORKING_DIRECTORY ./build-edgerouter-lite $CIRCLE_BRANCH;
BUILDDIR_YGG=$CIRCLE_WORKING_DIRECTORY ./build-vyos-i386 $CIRCLE_BRANCH
BUILDDIR_YGG=$CIRCLE_WORKING_DIRECTORY ./build-vyos-amd64 $CIRCLE_BRANCH
BUILDDIR_RIV=$CIRCLE_WORKING_DIRECTORY ./build-edgerouter-x $CIRCLE_BRANCH;
BUILDDIR_RIV=$CIRCLE_WORKING_DIRECTORY ./build-edgerouter-lite $CIRCLE_BRANCH;
BUILDDIR_RIV=$CIRCLE_WORKING_DIRECTORY ./build-vyos-i386 $CIRCLE_BRANCH
BUILDDIR_RIV=$CIRCLE_WORKING_DIRECTORY ./build-vyos-amd64 $CIRCLE_BRANCH
mv *.deb /tmp/upload;
- persist_to_workspace: