Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

Commit

Permalink
fixes from review
Browse files Browse the repository at this point in the history
  • Loading branch information
vmax committed Apr 5, 2019
1 parent d16dc88 commit 8bbd11a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
12 changes: 10 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ commands:
sudo ./bazel-0.24.0-installer-linux-x86_64.sh
rm ./bazel-0.24.0-installer-linux-x86_64.sh
bazel info release
install-deps:
steps:
- run:
name: Install extra dependencies (yapf3)
command: |
pip install yapf
restore-caches:
steps:
- restore_cache:
Expand All @@ -32,24 +38,26 @@ commands:
- "/home/circleci/.cache/bazel/"
jobs:
lint:
working_directory: ~/ng/
working_directory: ~/code/
machine:
enabled: true
image: ubuntu-1604:201903-01
steps:
- checkout
- install-bazel
- install-deps
- run: './tools/deps/check_dependencies.sh'
- run: './tools/fix_formatting.sh'

build:
working_directory: ~/ng/
working_directory: ~/code/
machine:
enabled: true
image: ubuntu-1604:201903-01
steps:
- checkout
- install-bazel
- install-deps
- restore-caches
- run: './tools/get_android_sdk.sh'
- run:
Expand Down
2 changes: 1 addition & 1 deletion tools/deps/WorkspacePatcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static String hasadnaPatch(String workpaceContents) {
return workpaceContents.replaceAll(
// (?s) enables multiline matching
"(?s)# MARK: StartupOS start.*# MARK: StartupOS end",
"local_repository(name=\"startup_os\",path=\"/home/circleci/ng/\")");
"local_repository(name=\"startup_os\",path=\"/home/circleci/code/\")");
}

public static void main(String[] args) throws IOException {
Expand Down

0 comments on commit 8bbd11a

Please sign in to comment.