Compare commits
	
		
			24 Commits
		
	
	
		
			d04bfe9faf
			...
			1.0.0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						5468e5ab59
	
				 | 
					
					
						|||
| 48da695413 | |||
| a648277dae | |||
| cb6a84568e | |||
| 
						
						
							
						
						cdaa3edfa6
	
				 | 
					
					
						|||
| de0e26e9ae | |||
| 671409c6af | |||
| b8cd7f01aa | |||
| e813dd0320 | |||
| 18f0fb1472 | |||
| 6d5813baa9 | |||
| 165e36a166 | |||
| d6b4a1776c | |||
| bee8c9df96 | |||
| 8189fd9c0e | |||
| a18c5d5598 | |||
| be482ff6f1 | |||
| 103f9eb436 | |||
| 6d5bcf2802 | |||
| 4a419d2862 | |||
| b5553936b0 | |||
| 3f7d33af91 | |||
| 03a9810f48 | |||
| fed8eb939b | 
							
								
								
									
										50
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										50
									
								
								.drone.yml
									
									
									
									
									
								
							@@ -12,6 +12,13 @@ get:
 | 
				
			|||||||
  path: odit-git-bot
 | 
					  path: odit-git-bot
 | 
				
			||||||
  name: sshkey
 | 
					  name: sshkey
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					---
 | 
				
			||||||
 | 
					kind: secret
 | 
				
			||||||
 | 
					name: ci_token
 | 
				
			||||||
 | 
					get:
 | 
				
			||||||
 | 
					  path: odit-ci-bot
 | 
				
			||||||
 | 
					  name: apikey
 | 
				
			||||||
 | 
					
 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
kind: pipeline
 | 
					kind: pipeline
 | 
				
			||||||
type: kubernetes
 | 
					type: kubernetes
 | 
				
			||||||
@@ -20,7 +27,7 @@ name: build:tag
 | 
				
			|||||||
steps:
 | 
					steps:
 | 
				
			||||||
  - name: run electron packager
 | 
					  - name: run electron packager
 | 
				
			||||||
    depends_on: ["clone"]
 | 
					    depends_on: ["clone"]
 | 
				
			||||||
    image: node:15.11.0-alpine3.13
 | 
					    image: registry.odit.services/hub/library/node:19.9.0-alpine3.16
 | 
				
			||||||
    commands:
 | 
					    commands:
 | 
				
			||||||
      - apk add git zip -f
 | 
					      - apk add git zip -f
 | 
				
			||||||
      - yarn
 | 
					      - yarn
 | 
				
			||||||
@@ -31,6 +38,7 @@ steps:
 | 
				
			|||||||
    depends_on: ["run electron packager"]
 | 
					    depends_on: ["run electron packager"]
 | 
				
			||||||
    image: plugins/gitea-release
 | 
					    image: plugins/gitea-release
 | 
				
			||||||
    settings:
 | 
					    settings:
 | 
				
			||||||
 | 
					      title: Release ${DRONE_TAG}
 | 
				
			||||||
      api_key:
 | 
					      api_key:
 | 
				
			||||||
        from_secret: gitea_token
 | 
					        from_secret: gitea_token
 | 
				
			||||||
      base_url: https://git.odit.services
 | 
					      base_url: https://git.odit.services
 | 
				
			||||||
@@ -42,6 +50,13 @@ steps:
 | 
				
			|||||||
        - sha512
 | 
					        - sha512
 | 
				
			||||||
        - adler32
 | 
					        - adler32
 | 
				
			||||||
        - crc32
 | 
					        - crc32
 | 
				
			||||||
 | 
					  - name: trigger live build
 | 
				
			||||||
 | 
					    depends_on: ["gitea_release"]
 | 
				
			||||||
 | 
					    image: idcooldi/drone-webhook
 | 
				
			||||||
 | 
					    settings:
 | 
				
			||||||
 | 
					      urls: https://ci.odit.services/api/repos/lfk/scanclient-live/builds?SOURCE_TAG=${DRONE_TAG}
 | 
				
			||||||
 | 
					      bearer:
 | 
				
			||||||
 | 
					        from_secret: ci_token
 | 
				
			||||||
trigger:
 | 
					trigger:
 | 
				
			||||||
  event:
 | 
					  event:
 | 
				
			||||||
    - tag
 | 
					    - tag
 | 
				
			||||||
@@ -53,35 +68,40 @@ name: prepare:tag
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
steps:
 | 
					steps:
 | 
				
			||||||
  - name: bump package version
 | 
					  - name: bump package version
 | 
				
			||||||
    image: node:alpine
 | 
					    image: registry.odit.services/hub/library/node:19.9.0-alpine3.16
 | 
				
			||||||
    commands:
 | 
					    commands:
 | 
				
			||||||
      - npm --no-git-tag-version version ${SOURCE_TAG}
 | 
					      - npm --no-git-tag-version version ${SOURCE_TAG}
 | 
				
			||||||
  - name: commit & tag
 | 
					  - name: push new version to repo
 | 
				
			||||||
 | 
					    image: appleboy/drone-git-push
 | 
				
			||||||
 | 
					    settings:
 | 
				
			||||||
 | 
					      commit: true
 | 
				
			||||||
 | 
					      commit_message: 🚀New package version ${SOURCE_TAG} [CI SKIP]
 | 
				
			||||||
 | 
					      author_email: bot@odit.services
 | 
				
			||||||
 | 
					      followtags: false
 | 
				
			||||||
 | 
					      branch: main
 | 
				
			||||||
 | 
					      remote: git@git.odit.services:lfk/scanclient-electron.git
 | 
				
			||||||
 | 
					      skip_verify: true
 | 
				
			||||||
 | 
					      ssh_key:
 | 
				
			||||||
 | 
					        from_secret: git_ssh
 | 
				
			||||||
 | 
					  - name: tag
 | 
				
			||||||
    image: alpine/git
 | 
					    image: alpine/git
 | 
				
			||||||
    commands:
 | 
					    commands:
 | 
				
			||||||
      - git add .
 | 
					      - git tag ${SOURCE_TAG} -a -m "Release ${SOURCE_TAG}"
 | 
				
			||||||
      - git commit -m "🚀New package version ${SOURCE_TAG} [CI SKIP]"
 | 
					  - name: push to repo
 | 
				
			||||||
      - git tag ${SOURCE_TAG}
 | 
					 | 
				
			||||||
  - name: push commit to repo
 | 
					 | 
				
			||||||
    image: appleboy/drone-git-push
 | 
					    image: appleboy/drone-git-push
 | 
				
			||||||
    settings:
 | 
					    settings:
 | 
				
			||||||
      branch: main
 | 
					 | 
				
			||||||
      commit: false
 | 
					      commit: false
 | 
				
			||||||
      author_email: bot@odit.services
 | 
					      author_email: bot@odit.services
 | 
				
			||||||
      remote: git@git.odit.services:lfk/scanclient-electron.git
 | 
					 | 
				
			||||||
      ssh_key:
 | 
					 | 
				
			||||||
        from_secret: git_ssh
 | 
					 | 
				
			||||||
  - name: push tag to repo
 | 
					 | 
				
			||||||
    image: appleboy/drone-git-push
 | 
					 | 
				
			||||||
    settings:
 | 
					 | 
				
			||||||
      followtags: true
 | 
					      followtags: true
 | 
				
			||||||
 | 
					      branch: main
 | 
				
			||||||
      remote: git@git.odit.services:lfk/scanclient-electron.git
 | 
					      remote: git@git.odit.services:lfk/scanclient-electron.git
 | 
				
			||||||
 | 
					      skip_verify: true
 | 
				
			||||||
      ssh_key:
 | 
					      ssh_key:
 | 
				
			||||||
        from_secret: git_ssh
 | 
					        from_secret: git_ssh
 | 
				
			||||||
 | 
					 | 
				
			||||||
trigger:
 | 
					trigger:
 | 
				
			||||||
  event:
 | 
					  event:
 | 
				
			||||||
    exclude:
 | 
					    exclude:
 | 
				
			||||||
    - push
 | 
					    - push
 | 
				
			||||||
 | 
					    - tag
 | 
				
			||||||
  include:
 | 
					  include:
 | 
				
			||||||
    - custom
 | 
					    - custom
 | 
				
			||||||
							
								
								
									
										16
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								README.md
									
									
									
									
									
								
							@@ -1,3 +1,19 @@
 | 
				
			|||||||
# scanclient-electron
 | 
					# scanclient-electron
 | 
				
			||||||
 | 
					
 | 
				
			||||||
electron packaged scanclient
 | 
					electron packaged scanclient
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Package
 | 
				
			||||||
 | 
					> Automagicly discovers your os and selects the right packager
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					pnpm i
 | 
				
			||||||
 | 
					pnpm build
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Bundle as MSI
 | 
				
			||||||
 | 
					> You need to install the [WiX MSI Buildtools](https://wixtoolset.org/docs/wix3/) first
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					pnpm i
 | 
				
			||||||
 | 
					pnpm build:msi
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
							
								
								
									
										
											BIN
										
									
								
								favicon.ico
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								favicon.ico
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 112 KiB  | 
							
								
								
									
										18
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								package.json
									
									
									
									
									
								
							@@ -1,19 +1,20 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	"name": "@lfk/scanclient-electron",
 | 
						"name": "@lfk/scanclient-electron",
 | 
				
			||||||
	"version": "0.0.4",
 | 
						"version": "1.0.0",
 | 
				
			||||||
	"description": "minimal electron application",
 | 
						"description": "minimal electron application",
 | 
				
			||||||
	"main": "main.js",
 | 
						"main": "main.js",
 | 
				
			||||||
	"scripts": {
 | 
						"scripts": {
 | 
				
			||||||
		"download": "node download.js",
 | 
							"download": "node download.js",
 | 
				
			||||||
		"build": "yarn download && yarn electron:package",
 | 
							"build:msi": "node download.js && electron-forge make",
 | 
				
			||||||
		"electron:start": "electron-forge start",
 | 
							"build": "yarn download && yarn electron-forge package",
 | 
				
			||||||
		"electron:package": "electron-forge package"
 | 
							"electron:start": "electron-forge start"
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
	"devDependencies": {
 | 
						"devDependencies": {
 | 
				
			||||||
		"@electron-forge/cli": "^6.0.0-beta.54",
 | 
							"@electron-forge/cli": "^6.0.0-beta.54",
 | 
				
			||||||
		"@electron-forge/maker-deb": "^6.0.0-beta.54",
 | 
							"@electron-forge/maker-deb": "^6.0.0-beta.54",
 | 
				
			||||||
		"@electron-forge/maker-rpm": "^6.0.0-beta.54",
 | 
							"@electron-forge/maker-rpm": "^6.0.0-beta.54",
 | 
				
			||||||
		"@electron-forge/maker-squirrel": "^6.0.0-beta.54",
 | 
							"@electron-forge/maker-squirrel": "^6.0.0-beta.54",
 | 
				
			||||||
 | 
							"@electron-forge/maker-wix": "^6.0.5",
 | 
				
			||||||
		"@electron-forge/maker-zip": "^6.0.0-beta.54",
 | 
							"@electron-forge/maker-zip": "^6.0.0-beta.54",
 | 
				
			||||||
		"@taraus-he/tdunzip": "^1.0.4",
 | 
							"@taraus-he/tdunzip": "^1.0.4",
 | 
				
			||||||
		"axios": "^0.21.1",
 | 
							"axios": "^0.21.1",
 | 
				
			||||||
@@ -39,6 +40,15 @@
 | 
				
			|||||||
						"name": "lfk__scanclient"
 | 
											"name": "lfk__scanclient"
 | 
				
			||||||
					}
 | 
										}
 | 
				
			||||||
				},
 | 
									},
 | 
				
			||||||
 | 
									{
 | 
				
			||||||
 | 
										"name": "@electron-forge/maker-wix",
 | 
				
			||||||
 | 
										"config": {
 | 
				
			||||||
 | 
											"manufacturer": "ODIT.Services",
 | 
				
			||||||
 | 
											"shortname": "LfKScan",
 | 
				
			||||||
 | 
											"name": "LfKScan",
 | 
				
			||||||
 | 
											"icon": "./favicon.ico"
 | 
				
			||||||
 | 
										}
 | 
				
			||||||
 | 
									},
 | 
				
			||||||
				{
 | 
									{
 | 
				
			||||||
					"name": "@electron-forge/maker-deb",
 | 
										"name": "@electron-forge/maker-deb",
 | 
				
			||||||
					"config": {}
 | 
										"config": {}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3856
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										3856
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user