Skip to content
This repository has been archived by the owner on Dec 29, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into beta-37
Browse files Browse the repository at this point in the history
  • Loading branch information
srevinsaju authored Apr 19, 2020
2 parents 6c0ec5b + d7e49a3 commit 3e4c0eb
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 21 deletions.
25 changes: 17 additions & 8 deletions .github/workflows/appimage.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
# Thanks @niess (https://github.com/niess) for python-appimage, creating appimages for Python is easy as pie!!

name: AppImage
on: [push]
on:
push:
paths:
- 'guiscrcpy/**'
- '.github/workflows/appimage.yml'
pull_request:
paths:
- 'guiscrcpy/**'
- '.github/workflows/appimage.yml'

jobs:
Test:
Expand All @@ -19,6 +27,7 @@ jobs:
- name: Test AppImage
run: |
python -m pip install python-appimage
echo $(realpath .) > appimage/requirements.txt
python -m python_appimage build app appimage \
--linux-tag=manylinux1_x86_64
Expand All @@ -39,20 +48,20 @@ jobs:
run: |
wget https://dl.bintray.com/srevinsaju/guiscrcpy/scrcpy/scrcpy
wget https://dl.bintray.com/srevinsaju/guiscrcpy/scrcpy/scrcpy-server
mkdir -p AppDir/usr/local/bin
cp scrcpy AppDir/usr/local/bin/.
chmod +x AppDir/usr/local/bin/scrcpy
mkdir -p AppDir/usr/local/share/scrcpy
cp scrcpy-server AppDir/usr/local/share/scrcpy/.
mkdir -p AppDir/usr/bin
cp scrcpy AppDir/usr/bin/.
chmod +x AppDir/usr/bin/scrcpy
mkdir -p AppDir/usr/share/scrcpy
cp scrcpy-server AppDir/usr/share/scrcpy/.
- name: Download scrcpy binary deps
run: |
wget https://dl.bintray.com/srevinsaju/guiscrcpy/scrcpy/scrcpy_processed.tar.gz
tar -xf scrcpy_processed.tar.gz
cp scrcpy_processed/* AppDir/usr/lib/.
- name: Patch Appimage to detect adb / scrcpy
run: |
sed -i '/APPDIR="${APPDIR:-${here}}"/aexport LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}" \nexport GUISCRCPY_SCRCPY="${APPDIR}/usr/local/bin/scrcpy"\nexport GUISCRCPY_ADB="${APPDIR}/usr/bin/adb"' AppDir/AppRun
sed -i '/APPDIR="${APPDIR:-${here}}"/aexport LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}" \nexport GUISCRCPY_SCRCPY="${APPDIR}/usr/bin/scrcpy"\nexport GUISCRCPY_ADB="${APPDIR}/usr/bin/adb"\nexport ADB="${APPDIR}/usr/bin/adb"\nexport SCRCPY_SERVER_PATH="${APPDIR}/usr/share/scrcpy/scrcpy-server"' AppDir/AppRun
- name: Reimage AppImage
run: |
rm ./guiscrcpy-x86_64.AppImage
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/macospython.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
name: Mac OS

on: [push]
on:
push:
paths:
- 'guiscrcpy/**'
- '.github/workflows/macospython.yml'
pull_request:
paths:
- 'guiscrcpy/**'
- '.github/workflows/macospython.yml'


jobs:
build:
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
name: Linux

on: [push]
on:
push:
paths:
- 'guiscrcpy/**'
- '.github/workflows/pythonapp.yml'
pull_request:
paths:
- 'guiscrcpy/**'
- '.github/workflows/pythonapp.yml'


jobs:
build:
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/winexe.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
name: Windows Executable

on:
on:
push:
branches:
- master
- develop
paths:
- 'guiscrcpy/**'
- '.github/workflows/winexe.yml'
pull_request:
branches:
- master
- develop
paths:
- 'guiscrcpy/**'
- '.github/workflows/winexe.yml'



jobs:
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/winpython.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
name: Windows

on: [push]
on:
push:
paths:
- 'guiscrcpy/**'
- '.github/workflows/winpython.yml'
pull_request:
paths:
- 'guiscrcpy/**'
- '.github/workflows/winpython.yml'


jobs:
build:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ For beta Windows compiled executables, click
[![Windows Executable](https://github.com/srevinsaju/guiscrcpy/workflows/Windows%20Executable/badge.svg)](https://github.com/srevinsaju/guiscrcpy/actions?query=+event%3Apush++is%3Asuccess+branch%3Amaster+workflow%3A%22Windows+Executable%22). Select the latest commit
and download the artifact.

~~For beta Linux compiled AppImages, click
![Build AppImage](https://github.com/srevinsaju/guiscrcpy/workflows/Build%20AppImage/badge.svg)
and download the artifact.~~. See Issues for the failure of creating a AppImage
For beta Linux compiled AppImages, click
[![AppImage](https://github.com/srevinsaju/guiscrcpy/workflows/AppImage/badge.svg)](https://github.com/srevinsaju/guiscrcpy/actions?query=event%3Apush+branch%3Amaster+is%3Asuccess+workflow%3AAppImage+)
and download the artifact. :tada: Thanks to @niess, guiscrcpy appimages are distributed for public use!!

![image of guiscrcpy](https://raw.githubusercontent.com/srevinsaju/guiscrcpy-docs/master/docs/screen3.png)

Expand Down

0 comments on commit 3e4c0eb

Please sign in to comment.