Reworked CI/CD logic
This commit is contained in:
Zakant
@@ -17,4 +17,11 @@ app/Database/de-DE/.~lock.l10n.xlsx#
|
||||
app/Database/.~lock.univ.xlsx#
|
||||
tablesSrc.json
|
||||
publishSettings.json
|
||||
|
||||
.env*
|
||||
.vscode/
|
||||
|
||||
|
||||
Tables.zip
|
||||
tables/
|
||||
deploy/tablesSrc.json
|
||||
|
||||
+64
-24
@@ -1,32 +1,72 @@
|
||||
language: node_js
|
||||
|
||||
node_js:
|
||||
- node
|
||||
|
||||
sudo: required
|
||||
|
||||
stages:
|
||||
- test
|
||||
- name: build
|
||||
if: tag IS present && branch = master
|
||||
# if: branch = master
|
||||
- name: buildInsider
|
||||
if: tag IS present && branch = develop
|
||||
# if: branch = develop
|
||||
|
||||
|
||||
jobs:
|
||||
include:
|
||||
- stage: Test
|
||||
script: npm test
|
||||
- stage: Build & Deploy
|
||||
name: Build OS X
|
||||
if: tag IS present && branch = master
|
||||
os: osx
|
||||
script: npm run compile && npm run release:osx
|
||||
- name: Build OS X Insider
|
||||
if: tag IS present && branch != master
|
||||
os: osx
|
||||
script: npm run compile && npm run prerelease:osx
|
||||
# Test stage
|
||||
- stage: test
|
||||
install:
|
||||
- npm i
|
||||
script:
|
||||
- npm test
|
||||
|
||||
# Normal build stage
|
||||
- stage: build
|
||||
name: Build Win
|
||||
os: windows
|
||||
install:
|
||||
- ./.travis/InstallWin.bat
|
||||
script:
|
||||
- npm run release:win
|
||||
|
||||
- name: Build Linux
|
||||
if: tag IS present && branch = master
|
||||
os: linux
|
||||
script: npm run compile && npm run release:linux
|
||||
- name: Build Linux Insider
|
||||
if: tag IS present && branch != master
|
||||
install:
|
||||
- sh ./.travis/InstallLinux.sh
|
||||
script:
|
||||
- npm run release:linux
|
||||
|
||||
- name: Build Mac
|
||||
os: osx
|
||||
install:
|
||||
- sh ./.travis/InstallMac.sh
|
||||
script:
|
||||
- npm run release:osx
|
||||
|
||||
# Insider build stage
|
||||
- stage: buildInsider
|
||||
name: Build Win
|
||||
os: windows
|
||||
install:
|
||||
- ./.travis/InstallWin.bat
|
||||
script:
|
||||
- npm run prerelease:win
|
||||
|
||||
- name: Build Linux
|
||||
os: linux
|
||||
script: npm run compile && npm run prerelease:linux
|
||||
- name: Build Windows
|
||||
if: tag IS present && branch = master
|
||||
os: win
|
||||
script: npm run compile && npm run release:win
|
||||
- name: Build Windows Insider
|
||||
if: tag IS present && branch != master
|
||||
os: win
|
||||
script: npm run compile && npm run prerelease:win
|
||||
install:
|
||||
- sh ./.travis/InstallLinux.sh
|
||||
script:
|
||||
- npm run prerelease:linux
|
||||
|
||||
- name: Build Mac
|
||||
os: osx
|
||||
install:
|
||||
- sh ./.travis/InstallMac.sh
|
||||
script:
|
||||
- npm run prerelease:osx
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
# Updated local cache
|
||||
echo apt update
|
||||
sudo apt update
|
||||
# Install python and pip
|
||||
echo apt install -y python3 python3-pip python3-setuptools python3-dev build-essential libssl-dev libffi-dev
|
||||
sudo apt install -y python3 python3-pip python3-setuptools python3-dev build-essential libssl-dev libffi-dev
|
||||
# Install needed package
|
||||
echo python3 -m pip install cryptography
|
||||
python3 -m pip install cryptography
|
||||
# Decrypt tables
|
||||
echo python3 prepareTables.py
|
||||
python3 prepareTables.py
|
||||
# Prepare node
|
||||
echo npm i
|
||||
npm i
|
||||
@@ -0,0 +1,9 @@
|
||||
# Install python from homebrew
|
||||
# Not necessary. Python already installed!
|
||||
# brew install python
|
||||
# Install neded packages
|
||||
python3 -m pip install cryptography
|
||||
# Decrypt tables
|
||||
python3 prepareTables.py
|
||||
# Prepare node
|
||||
npm i
|
||||
@@ -0,0 +1,12 @@
|
||||
REM Install python
|
||||
choco install python --version 3.7.2
|
||||
REM Install pip
|
||||
choco install pip
|
||||
REM Install OpenSSL
|
||||
choco install openssl.light
|
||||
REM Install needed packages
|
||||
C:/Python37/python.exe -m pip install cryptography
|
||||
REM Decrypt tables
|
||||
C:/Python37/python.exe prepareTables.py
|
||||
REM Prepare node
|
||||
npm i
|
||||
Vendored
-26
@@ -1,26 +0,0 @@
|
||||
{
|
||||
// Place your TDE app files workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
|
||||
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
|
||||
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
|
||||
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
|
||||
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
|
||||
// Placeholders with the same ids are connected.
|
||||
// Example:
|
||||
// "Print to console": {
|
||||
// "scope": "javascript,typescript",
|
||||
// "prefix": "log",
|
||||
// "body": [
|
||||
// "console.log('$1');",
|
||||
// "$2"
|
||||
// ],
|
||||
// "description": "Log output to console"
|
||||
// }
|
||||
"Print a indented Show to console": {
|
||||
"scope": "javascript,typescript,javascriptreact,typescriptreact",
|
||||
"prefix": "lshow",
|
||||
"body": [
|
||||
"console.log (showP ($1))"
|
||||
],
|
||||
"description": "Print the result of passing a value to `showP`, which properly indents the stringified value, to the console."
|
||||
}
|
||||
}
|
||||
Vendored
-42
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Launch",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"program": "${workspaceFolder}\\app\\index.js",
|
||||
"stopOnEntry": false,
|
||||
"args": [],
|
||||
"cwd": "${workspaceRoot}",
|
||||
//"preLaunchTask": "tsc: build - tsconfig.json",
|
||||
|
||||
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd",
|
||||
|
||||
"runtimeArgs": [
|
||||
".",
|
||||
"--enable-logging"
|
||||
],
|
||||
|
||||
"env": {}, "console": "internalConsole",
|
||||
"sourceMaps": true,
|
||||
"outFiles": [
|
||||
"${workspaceFolder}/**/*.js"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Attach",
|
||||
"type": "node",
|
||||
"request": "attach",
|
||||
"port": 5858,
|
||||
"address": "localhost",
|
||||
"restart": false,
|
||||
"sourceMaps": true,
|
||||
"outFiles": [
|
||||
"${workspaceFolder}/**/*.js"
|
||||
],
|
||||
"localRoot": "${workspaceRoot}",
|
||||
"remoteRoot": null
|
||||
}
|
||||
]
|
||||
}
|
||||
Vendored
-17
@@ -1,17 +0,0 @@
|
||||
{
|
||||
"typescript.tsdk": "node_modules\\typescript\\lib",
|
||||
"typescript.preferences.quoteStyle": "double",
|
||||
"javascript.preferences.quoteStyle": "double",
|
||||
"files.exclude": {
|
||||
"**/.git": true,
|
||||
"**/.svn": true,
|
||||
"**/.hg": true,
|
||||
"**/CVS": true,
|
||||
"**/.DS_Store": true,
|
||||
"**/*.js.map": true
|
||||
},
|
||||
"eslint.validate": [
|
||||
"typescript",
|
||||
"typescriptreact"
|
||||
]
|
||||
}
|
||||
Vendored
-84
@@ -1,84 +0,0 @@
|
||||
{
|
||||
// See https://go.microsoft.com/fwlink/?LinkId=733558
|
||||
// for the documentation about the tasks.json format
|
||||
"version": "2.0.0",
|
||||
"presentation": {
|
||||
"reveal": "always"
|
||||
},
|
||||
"type": "shell",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "build",
|
||||
"command": "npm run build",
|
||||
"problemMatcher": [
|
||||
"$tsc"
|
||||
]
|
||||
},
|
||||
{
|
||||
"label": "buildTest",
|
||||
"command": "npm run buildTest"
|
||||
},
|
||||
{
|
||||
"label": "buildMac",
|
||||
"command": "npm run buildMac"
|
||||
},
|
||||
{
|
||||
"label": "buildMacTest",
|
||||
"command": "npm run buildMacTest"
|
||||
},
|
||||
{
|
||||
"label": "watch",
|
||||
"command": "npm run watch"
|
||||
},
|
||||
{
|
||||
"label": "bundle",
|
||||
"command": "npm run bundle",
|
||||
"problemMatcher": [
|
||||
"$tsc"
|
||||
]
|
||||
},
|
||||
{
|
||||
"label": "run",
|
||||
"command": "npm start"
|
||||
},
|
||||
{
|
||||
"label": "bundle_l10ns",
|
||||
"command": "npm run bundle_l10ns"
|
||||
},
|
||||
{
|
||||
"label": "bundle_data",
|
||||
"command": "npm run bundle_data"
|
||||
},
|
||||
{
|
||||
"label": "bundle_css",
|
||||
"command": "npm run bundle_css"
|
||||
},
|
||||
{
|
||||
"type": "typescript",
|
||||
"tsconfig": "tsconfig.json",
|
||||
"isBackground": true,
|
||||
"problemMatcher": [
|
||||
"$tsc"
|
||||
],
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "typescript",
|
||||
"tsconfig": "tsconfig.json",
|
||||
"option": "watch",
|
||||
"isBackground": true,
|
||||
"problemMatcher": [
|
||||
"$tsc-watch"
|
||||
],
|
||||
"group": "build"
|
||||
},
|
||||
{
|
||||
"type": "npm",
|
||||
"script": "buildWin",
|
||||
"problemMatcher": []
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
# Contributor Covenant Code of Conduct
|
||||
|
||||
## Our Pledge
|
||||
|
||||
In the interest of fostering an open and welcoming environment, we as
|
||||
contributors and maintainers pledge to making participation in our project and
|
||||
our community a harassment-free experience for everyone, regardless of age, body
|
||||
size, disability, ethnicity, sex characteristics, gender identity and expression,
|
||||
level of experience, education, socio-economic status, nationality, personal
|
||||
appearance, race, religion, or sexual identity and orientation.
|
||||
|
||||
## Our Standards
|
||||
|
||||
Examples of behavior that contributes to creating a positive environment
|
||||
include:
|
||||
|
||||
* Using welcoming and inclusive language
|
||||
* Being respectful of differing viewpoints and experiences
|
||||
* Gracefully accepting constructive criticism
|
||||
* Focusing on what is best for the community
|
||||
* Showing empathy towards other community members
|
||||
|
||||
Examples of unacceptable behavior by participants include:
|
||||
|
||||
* The use of sexualized language or imagery and unwelcome sexual attention or
|
||||
advances
|
||||
* Trolling, insulting/derogatory comments, and personal or political attacks
|
||||
* Public or private harassment
|
||||
* Publishing others' private information, such as a physical or electronic
|
||||
address, without explicit permission
|
||||
* Other conduct which could reasonably be considered inappropriate in a
|
||||
professional setting
|
||||
|
||||
## Our Responsibilities
|
||||
|
||||
Project maintainers are responsible for clarifying the standards of acceptable
|
||||
behavior and are expected to take appropriate and fair corrective action in
|
||||
response to any instances of unacceptable behavior.
|
||||
|
||||
Project maintainers have the right and responsibility to remove, edit, or
|
||||
reject comments, commits, code, wiki edits, issues, and other contributions
|
||||
that are not aligned to this Code of Conduct, or to ban temporarily or
|
||||
permanently any contributor for other behaviors that they deem inappropriate,
|
||||
threatening, offensive, or harmful.
|
||||
|
||||
## Scope
|
||||
|
||||
This Code of Conduct applies both within project spaces and in public spaces
|
||||
when an individual is representing the project or its community. Examples of
|
||||
representing a project or community include using an official project e-mail
|
||||
address, posting via an official social media account, or acting as an appointed
|
||||
representative at an online or offline event. Representation of a project may be
|
||||
further defined and clarified by project maintainers.
|
||||
|
||||
## Enforcement
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||
reported by contacting the project team at support@optolith.app. All
|
||||
complaints will be reviewed and investigated and will result in a response that
|
||||
is deemed necessary and appropriate to the circumstances. The project team is
|
||||
obligated to maintain confidentiality with regard to the reporter of an incident.
|
||||
Further details of specific enforcement policies may be posted separately.
|
||||
|
||||
Project maintainers who do not follow or enforce the Code of Conduct in good
|
||||
faith may face temporary or permanent repercussions as determined by other
|
||||
members of the project's leadership.
|
||||
|
||||
## Attribution
|
||||
|
||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
|
||||
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
|
||||
|
||||
[homepage]: https://www.contributor-covenant.org
|
||||
|
||||
For answers to common questions about this code of conduct, see
|
||||
https://www.contributor-covenant.org/faq
|
||||
@@ -0,0 +1,57 @@
|
||||
import base64
|
||||
import sys
|
||||
import os
|
||||
import os.path
|
||||
import zipfile
|
||||
|
||||
import cryptography
|
||||
from cryptography.hazmat.backends import default_backend
|
||||
from cryptography.hazmat.primitives import hashes
|
||||
from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
|
||||
from cryptography.fernet import Fernet
|
||||
|
||||
def encryptTables(tableFolder):
|
||||
# Zip files into project
|
||||
zipf = zipfile.ZipFile('Tables.zip', 'w', zipfile.ZIP_DEFLATED)
|
||||
zipdir(tableFolder, zipf)
|
||||
zipf.close()
|
||||
|
||||
# Obtain key from enviroment variable
|
||||
key = os.environ['OPTOLITH_KEY']
|
||||
|
||||
# Create encryption key
|
||||
salt = b'optolithSalt'
|
||||
kdf = PBKDF2HMAC(
|
||||
algorithm=hashes.SHA256(),
|
||||
length=32,
|
||||
salt=salt,
|
||||
iterations=100000,
|
||||
backend=default_backend())
|
||||
cryptoKey = base64.urlsafe_b64encode(kdf.derive(key.encode(encoding='UTF-8')))
|
||||
|
||||
# Encrypt file
|
||||
f = Fernet(cryptoKey)
|
||||
with open("Tables.zip", "rb") as sourceFile:
|
||||
with open("Tables.crypto", "wb") as targetFile:
|
||||
encrypted = f.encrypt(sourceFile.read()) # For now. This creates larger files then necessary
|
||||
# encryptedBytes = base64.decodebytes(encrypted)
|
||||
targetFile.write(encrypted)
|
||||
|
||||
# Delete old table zip
|
||||
os.remove("Tables.zip")
|
||||
|
||||
|
||||
def zipdir(path, ziph):
|
||||
# ziph is zipfile handle
|
||||
for root, dirs, files in os.walk(path):
|
||||
for file in files:
|
||||
(p, extension) = os.path.splitext(file)
|
||||
if extension == ".xlsx" :
|
||||
ziph.write(os.path.join(root, file), os.path.relpath(os.path.join(root, file), path))
|
||||
|
||||
if __name__ == "__main__":
|
||||
if(len(sys.argv)) == 1:
|
||||
path = input("Bitte Pfad zu den Tabellen eingeben:\n> ")
|
||||
else:
|
||||
path = sys.argv[1]
|
||||
encryptTables(path)
|
||||
@@ -0,0 +1,53 @@
|
||||
import base64
|
||||
import sys
|
||||
import os
|
||||
import os.path
|
||||
import zipfile
|
||||
|
||||
import cryptography
|
||||
from cryptography.hazmat.backends import default_backend
|
||||
from cryptography.hazmat.primitives import hashes
|
||||
from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
|
||||
from cryptography.fernet import Fernet
|
||||
|
||||
def decryptTables():
|
||||
print("Decrypting tables")
|
||||
# Obtain key from enviroment variable
|
||||
key = os.environ['OPTOLITH_KEY']
|
||||
|
||||
# Create encryption key
|
||||
salt = b'optolithSalt'
|
||||
kdf = PBKDF2HMAC(
|
||||
algorithm=hashes.SHA256(),
|
||||
length=32,
|
||||
salt=salt,
|
||||
iterations=100000,
|
||||
backend=default_backend())
|
||||
cryptoKey = base64.urlsafe_b64encode(kdf.derive(key.encode(encoding='UTF-8')))
|
||||
|
||||
# Encrypt file
|
||||
f = Fernet(cryptoKey)
|
||||
with open("Tables.crypto", "rb") as sourceFile:
|
||||
with open("Tables.zip", "wb") as targetFile:
|
||||
# encrypted = base64.encodebytes(sourceFile.read())
|
||||
decrypted = f.decrypt(sourceFile.read())
|
||||
targetFile.write(decrypted)
|
||||
print("Tables decrypted")
|
||||
|
||||
def prepareTables():
|
||||
print("Unpacking tables")
|
||||
# Unpack zip file
|
||||
os.mkdir("tables")
|
||||
with zipfile.ZipFile("Tables.zip", 'r') as zip_ref:
|
||||
zip_ref.extractall("tables")
|
||||
# Create tablesSrc.json
|
||||
with open(os.path.join("deploy", "tablesSrc.json"), "w") as f:
|
||||
f.write("{\n\"stable\": [\".\", \"tables\"],\n\"insider\": [\".\", \"tables\", \"insider\"]\n}")
|
||||
print("Tables unpacked")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
print("Start to prepare tables...")
|
||||
decryptTables()
|
||||
prepareTables()
|
||||
print("Preparing tables finished")
|
||||
Reference in New Issue
Block a user