Skip to content

Commit de11067

Browse files
committed
[mistos][build] Update to use integration repo
Change-Id: I736cb9df0743bcd4cbff5a481b64ba50bcd26ebd
1 parent 859cd62 commit de11067

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.circleci/config.yml

+2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ jobs:
2121
command: |
2222
curl -s "https://fuchsia.googlesource.com/jiri/+/HEAD/scripts/bootstrap_jiri?format=TEXT" | base64 --decode | bash -s .
2323
export PATH=$PWD/.jiri_root/bin:$PATH
24+
jiri import -name=integration flower https://github.com/misttech/integration
2425
jiri update -v -vv
26+
git checkout $CIRCLE_BRANCH
2527
- save_cache:
2628
name: Save Jiri Package Cache
2729
key: *jiri-cache

README.md

+9-3
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,23 @@ It's based on Zircon Kernel from Fuchsia/LK project.
1414
_NOTE_: As derived from Fuchsia some scripts/tools are still necessary (plan to remove in the future).
1515

1616
```
17-
# Clone the REPO
18-
git clone https://github.com/misttech/mist-os.git
19-
2017
# Jiri Bootstrap:
2118
curl -s "https://fuchsia.googlesource.com/jiri/+/HEAD/scripts/bootstrap_jiri?format=TEXT" | base64 --decode | bash -s mist-os
2219
2320
# Update binary/packages dependencies using jiri
2421
cd mist-os
2522
export PATH=$PWD/.jiri_root/bin:$PATH
23+
24+
# Clone the REPO
25+
jiri import -name=integration flower https://github.com/misttech/integration
2626
jiri update
2727
28+
# Avoid jiri to update the project(git). It will be usefull for updating packages and deps (submodules).
29+
jiri project-config --no-update=true --no-rebase=true
30+
31+
# Check out the main branch
32+
git checkout main
33+
2834
# Build the kernel
2935
make it
3036

0 commit comments

Comments
 (0)