Skip to content
This repository has been archived by the owner on Jul 6, 2020. It is now read-only.

Commit

Permalink
moving in the code from final comp to main (#698)
Browse files Browse the repository at this point in the history
* Check in Y11 Shepherd

* Revert changes

* Moved dpad staffbot code; using git LFS

* Minor shepherd fixes

* Fixed some lint issues
  • Loading branch information
FIREdog5 authored and jonathan-j-lee committed Sep 12, 2019
1 parent f685a35 commit 4c1d618
Show file tree
Hide file tree
Showing 99 changed files with 6,229 additions and 888 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ dawn/static/website-robot-api-master/assets/fonts/* linguist-vendored
hibike/Arduino-Makefile/* linguist-vendored
hibike/lib/* linguist-vendored
hibike/lib/hibike/* linguist-vendored=false
shepherd/static/Spoiled_Candies.xcf filter=lfs diff=lfs merge=lfs -text
shepherd/static/Twisted.xcf filter=lfs diff=lfs merge=lfs -text
shepherd/static/BlueTwisted.xcf filter=lfs diff=lfs merge=lfs -text
shepherd/static/GoldTwisted.xcf filter=lfs diff=lfs merge=lfs -text
shepherd/static/icons[[:space:]]copy.ai filter=lfs diff=lfs merge=lfs -text
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,8 @@ hibike/virtual_devices.txt
# Webstorm project settings
.idea

# Visual Studio Code config
.vscode

# Visual Studio Code settings
.vscode/

### Custom
/dawn-*
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ matrix:
env: TEST_DIR=runtime
- name: Shepherd
language: python
python: 3.6
python: 3.7
env: TEST_DIR=shepherd
addons:
apt:
packages:
- python3-pip
- libasound2-dev
- socat
env:
global:
Expand Down
4 changes: 4 additions & 0 deletions DevOps/frankfurter/scripts/update/install_update
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#
# Usage: install_update [extracted-tarball-root]

sudo rm -rf /docs

piecentral="$HOME/PieCentral"
piecentral_backup="$HOME/PieCentral-backup"
systemd_units="/etc/systemd/system"
Expand Down Expand Up @@ -37,6 +39,8 @@ replace_package "$1/runtime" "$piecentral/runtime"
replace_package "$1/hibike" "$piecentral/hibike"
replace_package "$1/docs" "$HOME/docs"

sudo pip3 install "$1/resources/"*.whl "$1/resources/"*.tar.gz

# Restore files that should persist
cp "$piecentral_backup/runtime/studentCode.py" "$piecentral/runtime"
cp "$piecentral_backup/runtime/namedPeripherals.csv" "$piecentral/runtime"
Expand Down
31 changes: 0 additions & 31 deletions ansible-protos/fieldcontrol.proto

This file was deleted.

2 changes: 1 addition & 1 deletion dawn/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ start:
yarn start

install:
yarn install --frozen-lockfile
yarn install

artifacts-install:
yarn add --no-lockfile electron-packager
Expand Down
2 changes: 1 addition & 1 deletion dawn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"babel-preset-stage-3": "6.24.1",
"better-npm-run": "0.1.0",
"chai": "4.1.2",
"electron-devtools-installer": "2.2.3",
"electron-devtools-installer": "2.2.4",
"electron-packager": "^10.1.1",
"eslint": "4.18.1",
"eslint-config-airbnb": "16.1.0",
Expand Down
Loading

0 comments on commit 4c1d618

Please sign in to comment.