Skip to content

Commit

Permalink
Add development branch instructions (intel#91)
Browse files Browse the repository at this point in the history
  • Loading branch information
fboemer authored Nov 10, 2021
1 parent accf7a5 commit 18a10b1
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/github-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion port/hexl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 18a10b1

Please sign in to comment.