Merge pull request #346 from 68cdrBxM8YdoJ/fix-actions-deprecate-warning
Fix actions deprecate warning
This commit is contained in:
Yoshiko2
188
.github/workflows/main.yml
vendored
188
.github/workflows/main.yml
vendored
@@ -9,151 +9,65 @@ on:
|
|||||||
- master
|
- master
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Linux:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [windows-latest, macos-latest, ubuntu-latest]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Setup Python 3.8
|
- name: Setup Python 3.8
|
||||||
uses: actions/setup-python@v2
|
uses: actions/setup-python@v2
|
||||||
with:
|
with:
|
||||||
python-version: 3.8
|
python-version: 3.8
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
sed -i '$a pyinstaller' requirements.txt
|
pip install -r requirements.txt
|
||||||
pip install -r requirements.txt
|
pip install pyinstaller
|
||||||
|
|
||||||
- name: Test number_perser.get_number
|
- name: Test number_perser.get_number
|
||||||
run: |
|
run: |
|
||||||
python number_parser.py -v
|
python number_parser.py -v
|
||||||
|
|
||||||
- name: Set VERSION variable
|
- name: Build with PyInstaller for macos/ubuntu
|
||||||
run: |
|
if: matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest'
|
||||||
version=$(cat AV_Data_Capture.py | grep "version = " | tr -d "version = '")
|
run: |
|
||||||
echo "::set-env name=VERSION::$version"
|
pyinstaller \
|
||||||
|
--onefile AV_Data_Capture.py \
|
||||||
|
--hidden-import ADC_function.py \
|
||||||
|
--hidden-import core.py \
|
||||||
|
--add-data "$(python -c 'import cloudscraper as _; print(_.__path__[0])'):cloudscraper"
|
||||||
|
|
||||||
- name: Set CLOUDSCRAPER_PATH variable
|
- name: Build with PyInstaller for windows
|
||||||
run: |
|
if: matrix.os == 'windows-latest'
|
||||||
cloudscraper_path=$(python -c 'import cloudscraper as _; print(_.__path__[0])' | tail -n 1)
|
run: |
|
||||||
echo "::set-env name=CLOUDSCRAPER_PATH::$cloudscraper_path"
|
pyinstaller `
|
||||||
|
--onefile AV_Data_Capture.py `
|
||||||
|
--hidden-import ADC_function.py `
|
||||||
|
--hidden-import core.py `
|
||||||
|
--add-data "$(python -c 'import cloudscraper as _; print(_.__path__[0])');cloudscraper"
|
||||||
|
|
||||||
- name: Build with PyInstaller
|
- name: Copy config.ini
|
||||||
run: |
|
run: |
|
||||||
pyinstaller \
|
cp config.ini dist/
|
||||||
--onefile AV_Data_Capture.py \
|
|
||||||
--hidden-import ADC_function.py \
|
|
||||||
--hidden-import core.py \
|
|
||||||
--add-data "$CLOUDSCRAPER_PATH:cloudscraper"
|
|
||||||
|
|
||||||
- name: Copy config.ini
|
- name: Set VERSION variable for macos/ubuntu
|
||||||
run: |
|
if: matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest'
|
||||||
cp config.ini dist/
|
run: |
|
||||||
|
echo "VERSION=$(python AV_Data_Capture.py --version)" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Upload build artifact
|
- name: Set VERSION variable for windows
|
||||||
uses: actions/upload-artifact@v1
|
if: matrix.os == 'windows-latest'
|
||||||
with:
|
run: |
|
||||||
name: AV_Data_Capture-CLI-${{ env.VERSION }}-linux-amd64
|
echo "VERSION=$(python AV_Data_Capture.py --version)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
||||||
path: dist
|
|
||||||
|
|
||||||
Windows:
|
- name: Upload build artifact
|
||||||
runs-on: windows-latest
|
uses: actions/upload-artifact@v1
|
||||||
|
with:
|
||||||
steps:
|
name: AV_Data_Capture-CLI-${{ env.VERSION }}-${{ matrix.os }}-amd64
|
||||||
- uses: actions/checkout@v2
|
path: dist
|
||||||
|
|
||||||
- name: Setup Python 3.8
|
|
||||||
uses: actions/setup-python@v2
|
|
||||||
with:
|
|
||||||
python-version: 3.8
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
sed -i '$a pyinstaller' requirements.txt
|
|
||||||
pip install -r requirements.txt
|
|
||||||
|
|
||||||
- name: Test number_perser.get_number
|
|
||||||
run: |
|
|
||||||
python number_parser.py -v
|
|
||||||
|
|
||||||
- name: Set VERSION variable
|
|
||||||
run: |
|
|
||||||
$version=$(cat AV_Data_Capture.py | grep "version = " | tr -d "version = '")
|
|
||||||
echo "::set-env name=VERSION::$version"
|
|
||||||
|
|
||||||
- name: Set CLOUDSCRAPER_PATH variable
|
|
||||||
run: |
|
|
||||||
$cloudscraper_path=$(python -c 'import cloudscraper as _; print(_.__path__[0])' | select -Last 1)
|
|
||||||
echo "::set-env name=CLOUDSCRAPER_PATH::$cloudscraper_path"
|
|
||||||
|
|
||||||
- name: Build with PyInstaller
|
|
||||||
run: |
|
|
||||||
pyinstaller `
|
|
||||||
--onefile AV_Data_Capture.py `
|
|
||||||
--hidden-import ADC_function.py `
|
|
||||||
--hidden-import core.py `
|
|
||||||
--add-data "$env:CLOUDSCRAPER_PATH;cloudscraper"
|
|
||||||
|
|
||||||
- name: Copy config.ini
|
|
||||||
run: |
|
|
||||||
cp config.ini dist/
|
|
||||||
|
|
||||||
- name: Upload build artifact
|
|
||||||
uses: actions/upload-artifact@v1
|
|
||||||
with:
|
|
||||||
name: AV_Data_Capture-CLI-${{ env.VERSION }}-windows-amd64
|
|
||||||
path: dist
|
|
||||||
|
|
||||||
MacOS:
|
|
||||||
runs-on: macos-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Setup Python 3.8
|
|
||||||
uses: actions/setup-python@v2
|
|
||||||
with:
|
|
||||||
python-version: 3.8
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
sed -i '' '$a\
|
|
||||||
pyinstaller
|
|
||||||
' requirements.txt
|
|
||||||
pip install -r requirements.txt
|
|
||||||
|
|
||||||
- name: Test number_perser.get_number
|
|
||||||
run: |
|
|
||||||
python number_parser.py -v
|
|
||||||
|
|
||||||
- name: Set VERSION variable
|
|
||||||
run: |
|
|
||||||
version=$(cat AV_Data_Capture.py | grep "version = " | tr -d "version = '")
|
|
||||||
echo "::set-env name=VERSION::$version"
|
|
||||||
|
|
||||||
- name: Set CLOUDSCRAPER_PATH variable
|
|
||||||
run: |
|
|
||||||
cloudscraper_path=$(python -c 'import cloudscraper as _; print(_.__path__[0])' | tail -n 1)
|
|
||||||
echo "::set-env name=CLOUDSCRAPER_PATH::$cloudscraper_path"
|
|
||||||
|
|
||||||
- name: Build with PyInstaller
|
|
||||||
run: |
|
|
||||||
pyinstaller \
|
|
||||||
--onefile AV_Data_Capture.py \
|
|
||||||
--hidden-import ADC_function.py \
|
|
||||||
--hidden-import core.py \
|
|
||||||
--add-data "$CLOUDSCRAPER_PATH:cloudscraper"
|
|
||||||
|
|
||||||
- name: Copy config.ini
|
|
||||||
run: |
|
|
||||||
cp config.ini dist/
|
|
||||||
|
|
||||||
- name: Upload build artifact
|
|
||||||
uses: actions/upload-artifact@v1
|
|
||||||
with:
|
|
||||||
name: AV_Data_Capture-CLI-${{ env.VERSION }}-macos-amd64
|
|
||||||
path: dist
|
|
||||||
|
|||||||
@@ -18,11 +18,12 @@ def check_update(local_version):
|
|||||||
print("[*]======================================================")
|
print("[*]======================================================")
|
||||||
|
|
||||||
|
|
||||||
def argparse_function() -> [str, str, bool]:
|
def argparse_function(ver: str) -> [str, str, bool]:
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
parser.add_argument("file", default='', nargs='?', help="Single Movie file path.")
|
parser.add_argument("file", default='', nargs='?', help="Single Movie file path.")
|
||||||
parser.add_argument("-c", "--config", default='config.ini', nargs='?', help="The config file Path.")
|
parser.add_argument("-c", "--config", default='config.ini', nargs='?', help="The config file Path.")
|
||||||
parser.add_argument("-n", "--number", default='', nargs='?',help="Custom file number")
|
parser.add_argument("-n", "--number", default='', nargs='?',help="Custom file number")
|
||||||
|
parser.add_argument("--version", action="version", version=ver)
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
return args.file, args.config, args.number
|
return args.file, args.config, args.number
|
||||||
@@ -119,7 +120,7 @@ if __name__ == '__main__':
|
|||||||
version = '3.9.2'
|
version = '3.9.2'
|
||||||
|
|
||||||
# Parse command line args
|
# Parse command line args
|
||||||
single_file_path, config_file, custom_number = argparse_function()
|
single_file_path, config_file, custom_number = argparse_function(version)
|
||||||
|
|
||||||
# Read config.ini
|
# Read config.ini
|
||||||
conf = config.Config(path=config_file)
|
conf = config.Config(path=config_file)
|
||||||
|
|||||||
Reference in New Issue
Block a user