Skip to content

Commit

Permalink
v1.20.5
Browse files Browse the repository at this point in the history
* Set directory as last file's directory.
* Fix error when first opening program.
* Use Github Action to deploy instead of travis-ci.
  • Loading branch information
Wind2009-Louse committed Nov 3, 2021
1 parent 47eecfb commit 77fbf61
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 27 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# This workflow will upload a Python Package using Twine when a release is created

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Deploy

on:
push:
tags:
- "*"

jobs:
deploy_linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.7.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Build
run: pyinstaller main.py -F -w -n DuelEditor.out
- name: Deploy Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: dist/DuelEditor.out
deploy_windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.7.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Build
run: pyinstaller main.py -F -w -n DuelEditor.exe
- name: Deploy Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: dist/DuelEditor.exe
18 changes: 0 additions & 18 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DuelEditor

[![Build Status](https://travis-ci.com/Wind2009-Louse/DuelEditor.svg?branch=master)](https://travis-ci.com/Wind2009-Louse/DuelEditor)
[![Build Status](https://github.com/Wind2009-Louse/DuelEditor/actions/workflows/main.yml/badge.svg?branch=master)](https://travis-ci.com/Wind2009-Louse/DuelEditor)

决构工具

Expand Down
8 changes: 4 additions & 4 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
init_field = {"locations":{}, "desp":{}, "LP":[8000,8000], "fields":[]}
for t in range(len(idx_represent_str)):
init_field["fields"].append([])
version_idx = 200
version_name = "v1.20.0"
version_idx = 205
version_name = "v1.20.5"

default_mirror = "Github"
mirror_setting = {
Expand Down Expand Up @@ -1897,7 +1897,7 @@ def read_config(self):
f = open("DuelEditorConfig.jsn", 'r', encoding='utf-8')
config_data = loads(f.read())
except Exception as e:
return
pass
enable_config = [[self.blur_search_bar, "blur_search"], [self.coloring_field_card, "coloring_field"]]
for cfg in enable_config:
try:
Expand Down Expand Up @@ -2079,7 +2079,7 @@ def img_cache_clear(self, signal=None):
self.img_window_list = new_list

def mirror_bar_init(self, bar):
self.mirror_bar_list = bar.addMenu("镜像")
self.mirror_bar_list = bar.addMenu("镜像源")

self.mirror_action_dict = {}
for m_name in mirror_setting.keys():
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
jsonschema==3.0.1
PyQt5==5.12.2
pyinstaller>=3.6
requests==2.24.0
PyQt5==5.15.5
PyInstaller==3.6
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name": "v1.20.0", "version":120}
{"name": "v1.20.5", "version":205}

0 comments on commit 77fbf61

Please sign in to comment.