Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/OlivOS-Team/OlivOS
Browse files Browse the repository at this point in the history
  • Loading branch information
lunzhiPenxil committed May 2, 2022
2 parents 3eb0cf0 + 4d9e7a7 commit c4c2035
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 3 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/linux64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: CI-Packing-linux64
on:
push:
branches: [ main ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup Python
uses: actions/[email protected]
with:
python-version: 3.7.5
cache: pip
architecture: x64
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install -r ./requirements.txt
- name: Run packing
run: |
pyinstaller ./main.spec
- name: Run artifact
run: |
mkdir OlivOS-PKG
cp ./dist/main ./OlivOS-PKG/OlivOS
- name: Packing OlivOS-PKG
uses: actions/upload-artifact@v2
with:
name: OlivOS-Linux-64
path: ./OlivOS-PKG
2 changes: 1 addition & 1 deletion .github/workflows/win64.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI-Packing
name: CI-Packing-win64
on:
push:
branches: [ main ]
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
long_description = f.read()

setuptools.setup(name='olivos',
version='0.9.6',
version='0.9.8',
description='OlivOS - Witness Union',
long_description=long_description,
long_description_content_type='text/markdown',
Expand All @@ -38,7 +38,8 @@
'websocket-client',
'pillow',
'lxml',
'rsa'
'rsa',
'requests_toolbelt'
],
license='AGPLv3 License',
packages=setuptools.find_packages(),
Expand Down

0 comments on commit c4c2035

Please sign in to comment.