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.

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

feat(build): cstor repo migration to mayadata-io org #339

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
jobs:

cstor:
runs-on: ubuntu-16.04
runs-on: ubuntu-18.04
strategy:
fail-fast: true
matrix:
Expand All @@ -34,9 +34,9 @@ jobs:
- name: Set Branch
run: |
BRANCH="${GITHUB_REF##*/}"
REPO_ORG=${{ github.repository_owner }}
LCSTOR_ORG=openebs
echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
echo "REPO_ORG=${REPO_ORG}" >> $GITHUB_ENV
echo "LCSTOR_ORG=${LCSTOR_ORG}" >> $GITHUB_ENV

- name: Install Tool dependencies
run: buildscripts/install-tool-dep.sh
Expand Down
13 changes: 7 additions & 6 deletions buildscripts/install-build-dep.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
#!/bin/bash

# Mandatory variables
# $REPO_ORG organisation from which to clone the dependent repositories
# $LCSTOR_ORG organisation from which to clone the dependent repositories
# $BRANCH to be used for building
#
# Optional variables
# $UZFS_BUILD variable need to be set. If not kernel mode zfs will be built

if [ -z "${REPO_ORG}" ]; then
echo "REPO_ORG variable not set. Required for fetching dependent build repositories"

if [ -z "${LCSTOR_ORG}" ]; then
echo "LCSTOR_ORG variable not set. Required for fetching dependent build repositories"
exit 1
else
echo "Using repository organization: ${REPO_ORG}"
echo "Using repository organization: ${LCSTOR_ORG}"
fi

if [ -z "${BRANCH}" ]; then
Expand Down Expand Up @@ -51,7 +52,7 @@ make -j4
cd ..

# clone and build SPL
git clone https://github.com/${REPO_ORG}/spl
git clone https://github.com/pawanpraka1/spl
cd spl || exit 1
git checkout spl-0.7.9
sh autogen.sh
Expand All @@ -67,7 +68,7 @@ fi
cd ..

# Build libcstor for uzfs feature
git clone https://github.com/${REPO_ORG}/libcstor.git
git clone https://github.com/${LCSTOR_ORG}/libcstor.git
cd libcstor || exit 1
if [ "${BRANCH}" == "develop" ]; then
git checkout develop
Expand Down
11 changes: 1 addition & 10 deletions buildscripts/install-tool-dep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
# get the machine architecture
ARCH=$(uname -p)

sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get update -qq
sudo apt-get install --yes -qq gcc-6 g++-6
sudo apt-get install --yes -qq gcc g++
sudo apt-get install --yes -qq build-essential autoconf libtool gawk alien fakeroot libaio-dev jq
sudo apt-get install --yes -qq linux-headers-$(uname -r);
sudo apt-get install --yes -qq zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libssl-dev libjson-c-dev
Expand All @@ -18,11 +17,3 @@ if [ "$ARCH" == "x86_64" ]; then
fi

sudo apt-get install --yes -qq libgtest-dev cmake

# packages for debugging
sudo apt-get install gdb

# use gcc-6 by default
sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-6 /usr/bin/gcc
sudo unlink /usr/bin/g++ && sudo ln -s /usr/bin/g++-6 /usr/bin/g++