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

Update node & yarn; Don't consider subset dependency changes to be topology changes #492

Merged
merged 6 commits into from
Apr 16, 2019
Merged

Update node & yarn; Don't consider subset dependency changes to be topology changes #492

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d319cfb
Don't consider subset dependency changes to be topology changes
marcua Apr 15, 2019
6dfd618
Update yarn
marcua Apr 15, 2019
d87eec3
Update node
marcua Apr 15, 2019
ec46706
Fix build
marcua Apr 16, 2019
719e665
Address code review
marcua Apr 16, 2019
f6e5ff9
Undo code review :)
marcua Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
- run:
name: Install dependencies
command: |
curl -sL https://deb.nodesource.com/setup_7.x | bash - && apt-get install -y nodejs
curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.24.4
curl -sL https://deb.nodesource.com/setup_8.x | bash - && apt-get install -y nodejs
curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.15.2
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI no longer worked because this version was so old 😬

export PATH="$HOME/.yarn/bin:$PATH"
yarn global add gulp
yarn
Expand Down
10 changes: 3 additions & 7 deletions orchestra/static/dist/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1919,7 +1919,7 @@ a.logo {
@charset "UTF-8";
/*!
* Pikaday
* Copyright © 2014 David Bushell | BSD & MIT license | https://dbushell.com/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remind me why this stuff changes? (or why it's even checked in instead of being built at runtime?)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can yarn and check the built code into the repo---could consider cleaning that up int he future :)

* Copyright © 2014 David Bushell | BSD & MIT license | http://dbushell.com/
*/
.pika-single {
z-index: 9999;
Expand Down Expand Up @@ -2065,19 +2065,15 @@ a.logo {
border-radius: 3px; }
.is-disabled .pika-button,
.is-outside-current-month .pika-button {
pointer-events: none;
cursor: default;
color: #999;
opacity: .3; }
.is-disabled .pika-button {
pointer-events: none;
cursor: default; }
.pika-button:hover {
color: #fff;
background: #ff8000;
box-shadow: none;
border-radius: 3px; }
.pika-button .is-selection-disabled {
pointer-events: none;
cursor: default; }

.pika-week {
font-size: 11px;
Expand Down