image stuff
This commit is contained in:
1
.github/workflows/generator-linux.yml
vendored
1
.github/workflows/generator-linux.yml
vendored
@@ -295,6 +295,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
#mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak
|
#mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak
|
||||||
convert ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg
|
convert ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg
|
||||||
|
convert ./res/icon.png ./rustdesk/data/flutter_assets/assets/scalable.svg
|
||||||
|
|
||||||
- uses: rustdesk-org/run-on-arch-action@amd64-support
|
- uses: rustdesk-org/run-on-arch-action@amd64-support
|
||||||
name: Build rustdesk
|
name: Build rustdesk
|
||||||
|
|||||||
23
.github/workflows/generator-windows.yml
vendored
23
.github/workflows/generator-windows.yml
vendored
@@ -148,6 +148,10 @@ jobs:
|
|||||||
repository: rustdesk/rustdesk
|
repository: rustdesk/rustdesk
|
||||||
ref: refs/tags/${{ env.VERSION }}
|
ref: refs/tags/${{ env.VERSION }}
|
||||||
|
|
||||||
|
- name: Install wget
|
||||||
|
run: |
|
||||||
|
choco install wget -y
|
||||||
|
|
||||||
# - name: Install ImageMagick on Windows
|
# - name: Install ImageMagick on Windows
|
||||||
# run: |
|
# run: |
|
||||||
# choco install -y imagemagick.app --no-progress
|
# choco install -y imagemagick.app --no-progress
|
||||||
@@ -217,13 +221,13 @@ jobs:
|
|||||||
mv ./res/icon.ico ./res/icon.ico.bak
|
mv ./res/icon.ico ./res/icon.ico.bak
|
||||||
mv ./res/icon.png ./res/icon.png.bak
|
mv ./res/icon.png ./res/icon.png.bak
|
||||||
mv ./res/tray-icon.ico ./res/tray-icon.ico.bak
|
mv ./res/tray-icon.ico ./res/tray-icon.ico.bak
|
||||||
#echo "${{ inputs.iconbase64 }}" | base64 -d > ./res/icon.png
|
#echo "${{ inputs.iconbase64 }}" | base64 -d > ./res/icon.png
|
||||||
wget -O ./res/icon.png ${{ inputs.iconlink }}
|
|
||||||
|
|
||||||
- name: magick stuff
|
- name: magick stuff
|
||||||
if: ${{ inputs.iconlink != 'false' }}
|
if: ${{ inputs.iconlink != 'false' }}
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
run: |
|
run: |
|
||||||
|
wget -O ./res/icon.png ${{ inputs.iconlink }}
|
||||||
mv ./res/32x32.png ./res/32x32.png.bak
|
mv ./res/32x32.png ./res/32x32.png.bak
|
||||||
mv ./res/64x64.png ./res/64x64.png.bak
|
mv ./res/64x64.png ./res/64x64.png.bak
|
||||||
mv ./res/128x128.png ./res/128x128.png.bak
|
mv ./res/128x128.png ./res/128x128.png.bak
|
||||||
@@ -329,18 +333,19 @@ jobs:
|
|||||||
python .\build.py --portable --flutter --skip-portable-pack
|
python .\build.py --portable --flutter --skip-portable-pack
|
||||||
mv ./flutter/build/windows/x64/runner/Release ./rustdesk
|
mv ./flutter/build/windows/x64/runner/Release ./rustdesk
|
||||||
|
|
||||||
- name: logo stuff
|
# - name: logo stuff
|
||||||
if: ${{ inputs.logolink != 'false' }}
|
# if: ${{ inputs.logolink != 'false' }}
|
||||||
continue-on-error: true
|
# continue-on-error: true
|
||||||
shell: bash
|
# shell: bash
|
||||||
run: |
|
# run: |
|
||||||
#echo "${{ inputs.logobase64 }}" | base64 -d > ./rustdesk/data/flutter_assets/assets/logo.png
|
# #echo "${{ inputs.logobase64 }}" | base64 -d > ./rustdesk/data/flutter_assets/assets/logo.png
|
||||||
wget -O ./rustdesk/data/flutter_assets/assets/logo.png ${{ inputs.logolink }}
|
|
||||||
|
|
||||||
- name: icon stuff
|
- name: icon stuff
|
||||||
if: ${{ inputs.iconlink != 'false' }}
|
if: ${{ inputs.iconlink != 'false' }}
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
run: |
|
run: |
|
||||||
|
wget -O ./rustdesk/data/flutter_assets/assets/logo.png ${{ inputs.logolink }}
|
||||||
mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak
|
mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak
|
||||||
magick ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg
|
magick ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
|
|||||||
|
|
||||||
|
|
||||||
# SECURITY WARNING: don't run with debug turned on in production!
|
# SECURITY WARNING: don't run with debug turned on in production!
|
||||||
DEBUG = True
|
DEBUG = False
|
||||||
|
|
||||||
ALLOWED_HOSTS = ['*']
|
ALLOWED_HOSTS = ['*']
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user