Skip to content

Fix local build with pbuild.sh script#171

Merged
rmunn merged 3 commits into
masterfrom
chore/pbuild-checks-out-fw8-branches
Dec 7, 2021
Merged

Fix local build with pbuild.sh script#171
rmunn merged 3 commits into
masterfrom
chore/pbuild-checks-out-fw8-branches

Conversation

@rmunn
Copy link
Copy Markdown
Collaborator

@rmunn rmunn commented Dec 7, 2021

This allows the pbuild.sh script to build correctly again, so that you can do local builds and get .deb packages without needing to create a PR, and without blowing away uncommitted work in your local Git repo.


This change is Reviewable

rmunn added 3 commits December 3, 2021 18:47
This isn't needed in the GitHub Actions workflow since that runs in
separate containers with their own individually-checked-out copies of
the repo, but in the local build we only have one checked-out branch,
and we need to figure out the other branch to build. E.g. if the
checked-out branch comes from a FW9 branch, then we need to calculate
which FW8 branch to build (and default to fieldworks8-master). If the
checked-out branch is a FW8 branch, then we need to figure out which FW9
branch to build, and default to master.
@rmunn rmunn merged commit d47bd5a into master Dec 7, 2021
@rmunn rmunn deleted the chore/pbuild-checks-out-fw8-branches branch December 7, 2021 06:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant