Commit ddcf26d4 authored by Joel Collins's avatar Joel Collins
Browse files

Merge branch 'frame' into 'master'

Only build locally-served interface

See merge request !54
parents b81cbcc0 e46334e7
Loading
Loading
Loading
Loading
+0 −0

File moved.

+0 −0

File moved.

.env.production.app

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line
NODE_ENV=production
VUE_APP_PLATFORM=web
VUE_APP_TARGET=electron-renderer
 No newline at end of file

.gitlab-ci.yml

deleted100644 → 0
+0 −69
Original line number Diff line number Diff line
stages:
  - build
  - deploy


# Cache modules in between jobs
cache:
  key: ${CI_COMMIT_REF_SLUG}
  paths:
  - node_modules/


# Electron app build
build:
  stage: build
  image: electronuserland/builder:wine
 
  script:
    # Install node dependencies
    - npm install
    # Create build directory
    - mkdir -p "release-builds"
    # Build electron app
    - npm run build:app
    - npm run release

  artifacts:
    name: "dist"
    expire_in: 1 week
    paths:
      - "./release-builds/*.AppImage"
      - "./release-builds/*.exe"
      - "./release-builds/*.exe.blockmap"
      - "./release-builds/latest*.yml"
      - "./release-builds/beta*.yml"

  only:
    - merge_requests
    - master
    - web
    - tags


# Deploy to builds.openflexure.org
deploy:
  stage: deploy
  dependencies:
    - build
  image: ubuntu:latest
  
  before_script:
    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
    - eval $(ssh-agent -s)
    - ssh-add <(echo "$SSH_PRIVATE_KEY_BATH_OPENFLEXURE_BASE64" | base64 --decode)
    - mkdir -p ~/.ssh
    - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
    
  script:
    # Install rsync if not already installed
    - 'which rsync || ( apt-get update -y && apt-get install rsync -y )'
    
    # Upload the builds folder to openflexure-microscope builds 
    - rsync -hrvz -e ssh release-builds/ ci-user@openflexure.bath.ac.uk:/var/www/build/openflexure-ev/
    
    # Run update-latest.py on the build server
    - ssh -t ci-user@openflexure.bath.ac.uk "/var/www/build/update-latest.py"
    
  only:
    - tags

app/app.dev.js

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line
const electron = require("electron");
const contextMenu = require("electron-context-menu");
const path = require("path");

const app = electron.app;
const BrowserWindow = electron.BrowserWindow;

let url = "http://localhost:8080/";

// Set the application menu
require("./menu.js");

app.on("ready", () => {
  let window = new BrowserWindow({
    width: 1124,
    height: 800,
    icon: path.join(__dirname, "/icons/png/64x64.png")
  });

  contextMenu({
    showCopyImageAddress: true,
    showSaveImageAs: true,
    showInspectElement: true
  });

  window.loadURL(url);
});
Loading