From c42f69077597e80eb6f9f5c2877ccd72bfd8b653 Mon Sep 17 00:00:00 2001 From: Pawan Date: Wed, 9 Mar 2022 20:14:03 +0530 Subject: [PATCH 1/2] feat(build): cstor repo migration to mayadata-io org Signed-off-by: Pawan --- .github/workflows/build.yml | 6 +++--- buildscripts/install-build-dep.sh | 13 +++++++------ buildscripts/install-tool-dep.sh | 1 - 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62a5baa8207b..6a663eb8c63b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ on: jobs: cstor: - runs-on: ubuntu-16.04 + runs-on: ubuntu-latest strategy: fail-fast: true matrix: @@ -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 diff --git a/buildscripts/install-build-dep.sh b/buildscripts/install-build-dep.sh index f7bd5d05b1c1..5a728f4290a0 100755 --- a/buildscripts/install-build-dep.sh +++ b/buildscripts/install-build-dep.sh @@ -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 @@ -51,7 +52,7 @@ make -j4 cd .. # clone and build SPL -git clone https://github.com/${REPO_ORG}/spl +git clone https://github.com/${LCSTOR_ORG}/spl cd spl || exit 1 git checkout spl-0.7.9 sh autogen.sh @@ -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 diff --git a/buildscripts/install-tool-dep.sh b/buildscripts/install-tool-dep.sh index 973e34a589a5..f5a4e048c9f5 100755 --- a/buildscripts/install-tool-dep.sh +++ b/buildscripts/install-tool-dep.sh @@ -3,7 +3,6 @@ # 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 build-essential autoconf libtool gawk alien fakeroot libaio-dev jq From 4e0f25d824a4b65fc80cb68307aaf43e9cbc6e52 Mon Sep 17 00:00:00 2001 From: Pawan Date: Thu, 10 Mar 2022 14:22:21 +0530 Subject: [PATCH 2/2] fix build Signed-off-by: Pawan --- .github/workflows/build.yml | 2 +- buildscripts/install-build-dep.sh | 2 +- buildscripts/install-tool-dep.sh | 10 +--------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a663eb8c63b..4ce8df0ac26b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ on: jobs: cstor: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 strategy: fail-fast: true matrix: diff --git a/buildscripts/install-build-dep.sh b/buildscripts/install-build-dep.sh index 5a728f4290a0..dfeaa1bcc7ea 100755 --- a/buildscripts/install-build-dep.sh +++ b/buildscripts/install-build-dep.sh @@ -52,7 +52,7 @@ make -j4 cd .. # clone and build SPL -git clone https://github.com/${LCSTOR_ORG}/spl +git clone https://github.com/pawanpraka1/spl cd spl || exit 1 git checkout spl-0.7.9 sh autogen.sh diff --git a/buildscripts/install-tool-dep.sh b/buildscripts/install-tool-dep.sh index f5a4e048c9f5..7b45b393ebd4 100755 --- a/buildscripts/install-tool-dep.sh +++ b/buildscripts/install-tool-dep.sh @@ -4,7 +4,7 @@ ARCH=$(uname -p) 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 @@ -17,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++ -