From 18a10b1895cd2ac5a8f038c94568189ae98517d7 Mon Sep 17 00:00:00 2001 From: Fabian Boemer Date: Wed, 10 Nov 2021 10:14:34 -0800 Subject: [PATCH] Add development branch instructions (#91) --- .github/workflows/github-ci.yml | 2 ++ CONTRIBUTING.md | 2 +- README.md | 10 +++++++++- port/hexl/portfile.cmake | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index 86da147c..bf530e3f 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -8,11 +8,13 @@ on: pull_request: branches: - main + - development - "[0-9]+.[0-9]+.[0-9]+" # Run on release branch, e.g. 1.2.0 # Run when protected branches are pushed to, e.g. via merge push: branches: - main + - development - "[0-9]+.[0-9]+.[0-9]+" # Run on release branch, e.g. 1.2.0 # Manually run this workflow on any specified branch. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 43749798..c6ed5507 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Pull Requests -Intel HEXL welcomes pull requests from external contributors to the `main` branch. +Intel HEXL welcomes pull requests from external contributors to the `development` branch. Before contributing, please run ```bash diff --git a/README.md b/README.md index a679128b..cc929c64 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,15 @@ For convenience, they are listed below: | HEXL_TREAT_WARNING_AS_ERROR | ON / OFF | OFF | Set to ON to treat all warnings as error | ### Compiling Intel HEXL -To compile Intel HEXL from source code, first clone the repository and change directories to the where the source has been cloned. +To compile Intel HEXL from source code, first clone the repository. For latest changes, checkout the `development` branch. For more stable code, checkout the `main` branch, which will store the latest release. +```bash +# For development +git clone --branch development https://github.com/intel/hexl +# For latest release +git clone --branch main https://github.com/intel/hexl +``` +Then change directories to the where the source has been cloned, e.g. via `cd hexl` + #### Linux and Mac The instructions to build Intel HEXL are common to Linux and MacOS. diff --git a/port/hexl/portfile.cmake b/port/hexl/portfile.cmake index 58b8c6c2..23ac5634 100644 --- a/port/hexl/portfile.cmake +++ b/port/hexl/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/hexl - HEAD_REF main + HEAD_REF development ) set(VCPKG_BUILD_TYPE release)