Merge branch 'develop' into update/dark-mode-logic

actions/deploy-develop/Dockerfile → .github/actions/deploy/Dockerfile

@@ -4,5 +4,7 @@ RUN dpkg --add-architecture i386
 RUN apt update
 RUN apt -y install python make libxkbfile-dev libxkbfile-dev:i386 libx11-dev libx11-dev:i386 libxss-dev gcc-multilib g++-multilib rpm
 
-ADD entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
+COPY "entrypoint.sh" "/entrypoint.sh"
+ENTRYPOINT ["/entrypoint.sh"]
+
+CMD [""]

.github/actions/deploy/deploy.yml

@@ -0,0 +1,23 @@
+name: 'Deploy Simplenote'
+description: 'Builds and deploys Simplenote to VIP Go branches'
+branding:
+  icon: 'truck'
+  color: 'green'
+inputs:
+  APP_ID:
+    description: 'Application ID'
+    required: true
+  GITHUB_TOKEN:
+    description: 'GitHub Token'
+    requried: true
+  BRANCH:
+    description: 'Branch'
+    required: true
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  entrypoint: './.github/actions/deploy/entrypoint.sh'
+  env:
+    APP_ID: ${{ inputs.APP_ID }}
+    GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }}
+    BRANCH: ${{ inputs.BRANCH }}

.github/actions/deploy/entrypoint.sh

@@ -0,0 +1,66 @@
+#!/bin/sh -l
+
+COMMIT_BRANCH=''
+WEB_APP_URL=''
+APP_ENGINE_URL=''
+
+case $BRANCH in
+
+  "refs/heads/develop")
+    COMMIT_BRANCH='webapp-develop'
+    WEB_APP_URL='https://simplenote-develop.go-vip.net'
+    APP_ENGINE_URL='https://develop.simplenote.com'
+    ;;
+
+  "refs/heads/master")
+    COMMIT_BRANCH='webapp'
+    WEB_APP_URL='https://simplenote.go-vip.co'
+    APP_ENGINE_URL='https://app.simplenote.com'
+    ;;
+
+  *)
+    exit 0
+    ;;
+esac
+
+# Install Node Modules
+npm install
+
+#Setup config-local to override config
+json_string=$(printf '{"app_id": "%s", "app_key": "12345", "development": false, "wpcc_client_id": "0", "wpcc_redirect_url": "https://simplenote.com", "is_app_engine": true, "web_app_url": "%s", "app_engine_url": "%s"}' "$APP_ID" "$WEB_APP_URL" "$APP_ENGINE_URL")
+echo "$json_string" > config-local.json
+
+# Build site
+NODE_ENV=production make build
+
+# Variables
+ORIGIN_URL=$(git config --get remote.origin.url)
+
+# Checkout deploy branch
+if [ "$(git branch | grep $COMMIT_BRANCH)" ]
+then
+  git branch -D $COMMIT_BRANCH
+fi
+git checkout -b $COMMIT_BRANCH
+
+# Delete files not needed in production
+find . -maxdepth 1 ! -name '.git' ! -name 'dist' ! -name 'vip' -exec rm -rf {} \;
+
+# Copy vip files to base path
+cp -r vip/* ./
+
+# Delete uneeded vip folder
+rm -rf vip
+
+# Push to deploy
+git config user.name "GitHub Actions"
+git config user.email "[email protected]"
+
+git add --all
+git commit -m "Build: $COMMIT_BRANCH [ci skip]"
+git remote set-url origin https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}
+git push -f origin $COMMIT_BRANCH
+
+echo "Deployed Successfully!"
+
+exit 0

.github/workflows/deploy.yml

@@ -0,0 +1,16 @@
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: ./.github/actions/deploy
+        env:
+          APP_ID: ${{ secrets.APP_ID }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: ${{ github.ref }}

RELEASE-NOTES.txt

@@ -11,6 +11,8 @@
 - Updated colors to use Color Studio, the color palette for Automattic products
 - Fixes vertical spacing with nested markdown lists
 - Add ability to select system as a theme option and make it the default
+- Added a GitHub Action to deploy develop and master branches
+- Fixes sort order on revision slider when the timestamps don't match the change sequence [#1605](https://github.com/Automattic/simplenote-electron/pull/1605)
 
 ## [v1.7.0](https://github.com/Automattic/simplenote-electron/releases/tag/v1.7.0) (2019-08-12)
 

lib/revision-selector/index.jsx

@@ -9,8 +9,7 @@ import Slider from '../components/slider';
 import appState from '../flux/app-state';
 import { updateNoteTags } from '../state/domain/notes';
 
-const sortedRevisions = revisions =>
-  orderBy(revisions, 'data.modificationDate', 'asc');
+const sortedRevisions = revisions => orderBy(revisions, 'version', 'asc');
 
 export class RevisionSelector extends Component {
   static propTypes = {

lib/simperium/index.js

@@ -5,8 +5,6 @@ import localQueueStore from './local-queue-store';
 import util from 'util';
 import events from 'events';
 
-const Bucket = Client.Bucket;
-
 export const Auth = simperium.Auth;
 
 export default function(settings) {
@@ -19,7 +17,7 @@ export default function(settings) {
   return browserClient;
 }
 
-Bucket.prototype.query = function(fn) {
+Client.Bucket.prototype.query = function(fn) {
   this.store.setup.then(fn);
 };