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.

Sign up for GitHub

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

Jump to bottom

Do not fail the build if PARTICLE_DEVELOP is not defined #1750

Merged
merged 1 commit into from
Apr 23, 2019
Merged

Do not fail the build if PARTICLE_DEVELOP is not defined #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 5 additions & 11 deletions build/checks.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
ifneq (, $(shell command -v git;))
git_branch := $(shell git rev-parse --abbrev-ref HEAD)
ifeq ("$(git_branch)","develop")
ifndef PARTICLE_DEVELOP
$(error Please note the develop branch contains untested, unreleased code. \
We recommend using the 'release/stable' branch which contains the latest released firmware code. \
To build the develop branch, please see the the build documentation at \
https://github.com/spark/firmware/blob/develop/docs/build.md#building-the-develop-branch)
endif
endif
endif
# Add environment checks here

#ifeq (,$(shell command -v git;))
# $(error Git is not installed)
#endif
8 changes: 1 addition & 7 deletions docs/build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,19 +488,13 @@ Before the 0.4.0 firmware was released, we recommended the develop branch for ea

Pre-releases are available in `release/vx.x.x-rc.x` branches. Default released firmware is available as `release/vx.x.x`, which is also then duplicated to `release/stable` and `master` branches.

To build the develop branch, follow these guidelines:

1. export the environment variable PARTICLE_DEVELOP=1
2. after pulling from the develop branch, be sure to build and flash the system firmware


## Recipes and Tips

- The variables passed to make can also be provided as environment variables,
so you avoid having to type them out for each build. The environment variable value can be overridden
by passing the variable on the command line.
- `PARTICLE_DEVELOP` can be set in the environment when building from the `develop` branch. (Caveats apply that this is bleeding edge!)
- `PLATFORM` set in the environment if you mainly build for one platform, e.g. the Photon.
- `PLATFORM` set in the environment if you mainly build for one platform, e.g. the Photon.

### Photon

Expand Down