Commit 9e34cb49 authored by Joel Collins's avatar Joel Collins
Browse files

Tidied up CI

parent c72247fa

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ build: 
    - mkdir -p "release-builds"

    # Build electron app

    - npm run build:app

    - if [ "$CI_COMMIT_REF_NAME" == "stable" ]; then npm run release; else npm run release:pre; fi

    - npm run release



  artifacts:

    name: "dist"
@@ -52,9 +52,9 @@ build: 


  only:

    - merge_requests

    - stable

    - master

    - web

    - tags





# Deploy to builds.openflexure.org
@@ -82,4 +82,4 @@ deploy: 
    - ssh -t ci-user@openflexure.bath.ac.uk "/var/www/build/update-latest.py"

    

  only:

    - stable
 
    - tags

app/builder-config-raspi-pre.yaml

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
extends: app/builder-config-base.yaml

artifactName: ${name}-${os}-${arch}.${ext}

linux:

  target:

    - target: deb

      arch:

        - armv7l

    - target: appImage

      arch:

        - armv7l

  icon: app/icons/png/

  category: Science

deb:

  fpm: ['--architecture', 'armhf']

app/builder-config-x86_64-pre.yaml

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
extends: app/builder-config-base.yaml

artifactName: ${name}-${os}-${arch}.${ext}

win:

  target:

    - NSIS

  icon: app/icons/win/icon.ico

linux:

  target:

    - target: deb

      arch:

        - x64

    - target: appImage

      arch:

        - x64

  icon: app/icons/png/

  category: Science

mac:

  icon: app/icons/mac/icon.icns

  category: public.app-category.utilities

dmg:

  contents:

    - x: 110

      y: 150

    - x: 240

      y: 150

      type: link

      path: /Applications

package.json

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
    "dist:dmg": "electron-builder --mac --config app/builder-config-x86_64.yaml",

    "dist:appx": "electron-builder --win --config app/builder-config-appx.yaml",

    "release": "electron-builder --linux --config app/builder-config-raspi.yaml & electron-builder --win --linux --config app/builder-config-x86_64.yaml",

    "release:pre": "electron-builder --linux --config app/builder-config-raspi-pre.yaml & electron-builder --win --linux --config app/builder-config-x86_64-pre.yaml",

    "make-icons": "electron-icon-builder --input=./app/icons/icon_base.png --output=./app/"

  },

  "dependencies": {