From 9ea371f771c790e86c1fc3d825c9269b0f04e411 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 14:44:43 +1300 Subject: [PATCH 01/35] Adds build action I don't fully expect the Windows or Linux builds to work, but macOS should. --- .github/workflows/build.yml | 68 +++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..93e14bc7 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,68 @@ +name: Build Rclone Browser + +on: + push: + workflow_dispatch: + +jobs: + build_windows: + name: Windows Build + runs-on: windows-latest + + steps: + - uses: actions/checkout@v3 + - name: Install Development Tools + run: choco install visualstudio2019community visualstudio2019-workload-nativedesktop cmake qt5-default -y + - name: Build Rclone Browser + run: | + cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_PREFIX_PATH=c:\Qt\5.15.2\msvc2017_64 .. + cmake --build . --config Release + C:\Qt\5.15.2\msvc2017_64\bin\windeployqt.exe --no-translations --no-angle --no-compiler-runtime --no-svg ".\build\Release\RcloneBrowser.exe" + - uses: actions/upload-artifact@v3 + with: + name: RcloneBrowser.exe + path: .\build\Release\RcloneBrowser.exe + + build_linux: + name: Linux Build + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Install Development Tools + run: | + sudo apt update + sudo apt -y install git g++ cmake make qtdeclarative5-dev qtmultimedia5-dev + - name: Build Rclone Browser + run: | + mkdir build + cd build + cmake .. + make -j $(nproc) + ### TODO: Upload the artifact when we know where it lives + ls + + build_macos: + name: macOS Build + runs-on: macos-latest + + steps: + - uses: actions/checkout@v3 + - name: Install Development Tools + run: brew install git cmake rclone qt5 + - name: + run: | + mkdir build + cd build + cmake .. -DCMAKE_PREFIX_PATH:PATH=/usr/local/opt/qt5 + make -j $(nproc) + cd build + /usr/local/opt/qt@5/bin/macdeployqt rclone-browser.app -executable="rclone-browser.app/Contents/MacOS/rclone-browser" -qmldir=../src/ + mv rclone-browser.app Rclone\ Browser.app + zip -r -0 Rclone\ Browser.zip Rclone\ Browser.app + - uses: actions/upload-artifact@v3 + with: + name: Rclone Browser (macOS) + path: build/build/*.zip + + From cbaf3c4b64b05f80ffca47494e9f618f3587eae3 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 14:48:00 +1300 Subject: [PATCH 02/35] Fixes naming on macOS, lists build directory on linux --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93e14bc7..7723c8c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: cmake .. make -j $(nproc) ### TODO: Upload the artifact when we know where it lives - ls + ls build build_macos: name: macOS Build @@ -50,7 +50,7 @@ jobs: - uses: actions/checkout@v3 - name: Install Development Tools run: brew install git cmake rclone qt5 - - name: + - name: Build Rclone Browser run: | mkdir build cd build From 4ccdfeef7e60f5ccbcc211dce9feeca41afcdc36 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 14:48:57 +1300 Subject: [PATCH 03/35] `osxfuse.fs` is now `macfuse.fs` --- src/remote_widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote_widget.cpp b/src/remote_widget.cpp index 7749ecb1..1ddb80ff 100644 --- a/src/remote_widget.cpp +++ b/src/remote_widget.cpp @@ -1424,7 +1424,7 @@ RemoteWidget::RemoteWidget(IconCache *iconCache, const QString &remote, #if defined(Q_OS_MACOS) // on macOS we check if FUSE for macOS is installed - const QFileInfo outputDir("/Library/Filesystems/osxfuse.fs/"); + const QFileInfo outputDir("/Library/Filesystems/macfuse.fs/"); if (outputDir.exists()) { From e59528de12be9763015384b6fb3e72dbb5636bc6 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 15:03:12 +1300 Subject: [PATCH 04/35] fixes build naming, uploads linux artifact Also fixes Windows Qt5 path --- .github/workflows/build.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7723c8c5..ae4d6f2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,12 +15,12 @@ jobs: run: choco install visualstudio2019community visualstudio2019-workload-nativedesktop cmake qt5-default -y - name: Build Rclone Browser run: | - cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_PREFIX_PATH=c:\Qt\5.15.2\msvc2017_64 .. + cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_PREFIX_PATH=C:\Qt\5.15.2 .. cmake --build . --config Release - C:\Qt\5.15.2\msvc2017_64\bin\windeployqt.exe --no-translations --no-angle --no-compiler-runtime --no-svg ".\build\Release\RcloneBrowser.exe" + C:\Qt\5.15.2\bin\windeployqt.exe --no-translations --no-angle --no-compiler-runtime --no-svg ".\build\Release\RcloneBrowser.exe" - uses: actions/upload-artifact@v3 with: - name: RcloneBrowser.exe + name: Rclone Browser (Windows) path: .\build\Release\RcloneBrowser.exe build_linux: @@ -39,8 +39,11 @@ jobs: cd build cmake .. make -j $(nproc) - ### TODO: Upload the artifact when we know where it lives - ls build + + - uses: actions/upload-artifact@v3 + with: + name: Rclone Browser (Linux) + path: build/build/rclone-browser build_macos: name: macOS Build From 42edf761bd5b7eef1b28b2e63839eca5e0d67249 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 17:02:55 +1300 Subject: [PATCH 05/35] Fix Qt on Windows --- .github/workflows/build.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae4d6f2c..55ebed96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,12 +12,25 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install Development Tools - run: choco install visualstudio2019community visualstudio2019-workload-nativedesktop cmake qt5-default -y + run: | + choco install visualstudio2019community visualstudio2019-workload-nativedesktop cmake python38 qt5-default -y + curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + refreshenv + python3.8 get-pip.py + refreshenv + C:\Python38\Scripts\pip3.8.exe install py7zr lxml requests semantic-version + mkdir C:\Qt + pushd C:\Qt + git clone https://github.com/engnr/qt-downloader.git + cd qt-downloader + python3.8 qt-downloader windows desktop 5.15.2 win64_msvc2019_64 + popd + - name: Build Rclone Browser run: | - cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_PREFIX_PATH=C:\Qt\5.15.2 .. + cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_PREFIX_PATH=C:\Qt\5.15.2\msvc2019_64 .. cmake --build . --config Release - C:\Qt\5.15.2\bin\windeployqt.exe --no-translations --no-angle --no-compiler-runtime --no-svg ".\build\Release\RcloneBrowser.exe" + C:\Qt\5.15.2\msvc2019_64\bin\windeployqt.exe --no-translations --no-angle --no-compiler-runtime --no-svg ".\build\Release\RcloneBrowser.exe" - uses: actions/upload-artifact@v3 with: name: Rclone Browser (Windows) From 7b8106db6717231b8e2cd9f33d49113cc9d3a084 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 17:35:02 +1300 Subject: [PATCH 06/35] Fix Python on Windows --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55ebed96..c79d998b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,12 +13,12 @@ jobs: - uses: actions/checkout@v3 - name: Install Development Tools run: | - choco install visualstudio2019community visualstudio2019-workload-nativedesktop cmake python38 qt5-default -y + choco install visualstudio2019community visualstudio2019-workload-nativedesktop cmake qt5-default -y curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py refreshenv - python3.8 get-pip.py + python get-pip.py refreshenv - C:\Python38\Scripts\pip3.8.exe install py7zr lxml requests semantic-version + pip install py7zr lxml requests semantic-version mkdir C:\Qt pushd C:\Qt git clone https://github.com/engnr/qt-downloader.git From c38af2b8578a79f1d635a96bfc178c8fd8addc0f Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 17:57:16 +1300 Subject: [PATCH 07/35] `python` not `python3.8` on actions --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c79d998b..1d3a6ec1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: pushd C:\Qt git clone https://github.com/engnr/qt-downloader.git cd qt-downloader - python3.8 qt-downloader windows desktop 5.15.2 win64_msvc2019_64 + python qt-downloader windows desktop 5.15.2 win64_msvc2019_64 popd - name: Build Rclone Browser From fd48c8afd6c3f669663456f0c2ef4836ed94aaf2 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 21:28:53 +1300 Subject: [PATCH 08/35] Fixes Qt path for Windows --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d3a6ec1..4d50f6c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,8 +22,9 @@ jobs: mkdir C:\Qt pushd C:\Qt git clone https://github.com/engnr/qt-downloader.git - cd qt-downloader - python qt-downloader windows desktop 5.15.2 win64_msvc2019_64 + mv qt-downloader/qt-downloader .\qtd + rm -f qt-downloader + python qtd windows desktop 5.15.2 win64_msvc2019_64 popd - name: Build Rclone Browser From 40e6558228da51946c861cbe74ed860fe41e20a5 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 21:49:44 +1300 Subject: [PATCH 09/35] Fix Remove-Item command Also renames artifacts in preparation for releases --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d50f6c1..ce3fe800 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: pushd C:\Qt git clone https://github.com/engnr/qt-downloader.git mv qt-downloader/qt-downloader .\qtd - rm -f qt-downloader + Remove-Item -Recurse -Force qt-downloader python qtd windows desktop 5.15.2 win64_msvc2019_64 popd @@ -34,7 +34,7 @@ jobs: C:\Qt\5.15.2\msvc2019_64\bin\windeployqt.exe --no-translations --no-angle --no-compiler-runtime --no-svg ".\build\Release\RcloneBrowser.exe" - uses: actions/upload-artifact@v3 with: - name: Rclone Browser (Windows) + name: windows path: .\build\Release\RcloneBrowser.exe build_linux: @@ -56,7 +56,7 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: Rclone Browser (Linux) + name: linux path: build/build/rclone-browser build_macos: @@ -79,7 +79,7 @@ jobs: zip -r -0 Rclone\ Browser.zip Rclone\ Browser.app - uses: actions/upload-artifact@v3 with: - name: Rclone Browser (macOS) + name: macos path: build/build/*.zip From ee6745f3ac311d94b5527d38075561caf136b6a5 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 22:20:54 +1300 Subject: [PATCH 10/35] Correct CMake Command --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce3fe800..2959593f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,6 +29,8 @@ jobs: - name: Build Rclone Browser run: | + mkdir build + cd build cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_PREFIX_PATH=C:\Qt\5.15.2\msvc2019_64 .. cmake --build . --config Release C:\Qt\5.15.2\msvc2019_64\bin\windeployqt.exe --no-translations --no-angle --no-compiler-runtime --no-svg ".\build\Release\RcloneBrowser.exe" From a2e96c64ae1d1a1f6edb181c0697a8fd46ccc8db Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 22:50:45 +1300 Subject: [PATCH 11/35] Adds FreeBSD, OpenBSD, and NetBSD builds --- .github/workflows/build.yml | 60 ++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2959593f..a62f85fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,7 +59,7 @@ jobs: - uses: actions/upload-artifact@v3 with: name: linux - path: build/build/rclone-browser + path: build/build/* build_macos: name: macOS Build @@ -84,4 +84,62 @@ jobs: name: macos path: build/build/*.zip + build_freebsd: + runs-on: macos-12 + steps: + - uses: actions/checkout@v3 + - name: Install Development Tools and Build Rclone Browser + uses: vmactions/freebsd_vm@v0 + with: + prepare: | + sudo pkg install git cmake qt5-buildtools qt5-declarative qt5-multimedia qt5-qmake -y + mkdir build + cd build + cmake .. + make + + - uses: actions/upload-artifact@v3 + with: + name: freebsd + path: build/build/* + + build_openbsd: + runs-on: macos-12 + + steps: + - uses: actions/checkout@v3 + - name: Install Development Tools and Build Rclone Browser + uses: vmactions/freebsd_vm@v0 + with: + prepare: | + sudo pkg_add git cmake qt5 -y + mkdir build + cd build + cmake .. -DCMAKE_PREFIX_PATH:PATH=/usr/local/lib/qt5/cmak + make + + - uses: actions/upload-artifact@v3 + with: + name: openbsd + path: build/build/* + + build_netbsd: + runs-on: macos-12 + + steps: + - uses: actions/checkout@v3 + - name: Install Development Tools and Build Rclone Browser + uses: vmactions/freebsd_vm@v0 + with: + prepare: | + sudo pkgin install git cmake qt5-qtdeclarative qt5-qtmultimedia -y + mkdir build + cd build + cmake .. + make + + - uses: actions/upload-artifact@v3 + with: + name: netbsd + path: build/build/* From 66f9df6d44b8d7889b3b3a0820940ddba70d130b Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 22:52:27 +1300 Subject: [PATCH 12/35] Gives FreeBSD, OpenBSD, and NetBSD jobs names --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a62f85fc..77911583 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,6 +85,7 @@ jobs: path: build/build/*.zip build_freebsd: + name: FreeBSD Build runs-on: macos-12 steps: @@ -105,6 +106,7 @@ jobs: path: build/build/* build_openbsd: + name: OpenBSD Build runs-on: macos-12 steps: @@ -125,6 +127,7 @@ jobs: path: build/build/* build_netbsd: + name: NetBSD Build runs-on: macos-12 steps: From 38aa90d5e82b23dcd1255f033e866da13237963a Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 22:54:14 +1300 Subject: [PATCH 13/35] Corrects BSD actions --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77911583..97be1430 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,7 +91,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install Development Tools and Build Rclone Browser - uses: vmactions/freebsd_vm@v0 + uses: vmactions/freebsd-vm@v0 with: prepare: | sudo pkg install git cmake qt5-buildtools qt5-declarative qt5-multimedia qt5-qmake -y @@ -112,7 +112,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install Development Tools and Build Rclone Browser - uses: vmactions/freebsd_vm@v0 + uses: vmactions/openbsd-vm@v0 with: prepare: | sudo pkg_add git cmake qt5 -y @@ -133,7 +133,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install Development Tools and Build Rclone Browser - uses: vmactions/freebsd_vm@v0 + uses: vmactions/netbsd-vm@v0 with: prepare: | sudo pkgin install git cmake qt5-qtdeclarative qt5-qtmultimedia -y From a0606069cebe9d86bcdb939ff3b433a96be1f379 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 22:58:40 +1300 Subject: [PATCH 14/35] There is no sudo --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 97be1430..b3bea569 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -94,7 +94,7 @@ jobs: uses: vmactions/freebsd-vm@v0 with: prepare: | - sudo pkg install git cmake qt5-buildtools qt5-declarative qt5-multimedia qt5-qmake -y + pkg install git cmake qt5-buildtools qt5-declarative qt5-multimedia qt5-qmake -y mkdir build cd build cmake .. @@ -115,7 +115,7 @@ jobs: uses: vmactions/openbsd-vm@v0 with: prepare: | - sudo pkg_add git cmake qt5 -y + pkg_add git cmake qt5 -y mkdir build cd build cmake .. -DCMAKE_PREFIX_PATH:PATH=/usr/local/lib/qt5/cmak @@ -136,7 +136,7 @@ jobs: uses: vmactions/netbsd-vm@v0 with: prepare: | - sudo pkgin install git cmake qt5-qtdeclarative qt5-qtmultimedia -y + pkgin install git cmake qt5-qtdeclarative qt5-qtmultimedia -y mkdir build cd build cmake .. From 7939e7241e42c31dc862a21f93fe5b0601fabd0b Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 23:08:56 +1300 Subject: [PATCH 15/35] Fixes BSD package installation --- .github/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3bea569..60168599 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -94,7 +94,8 @@ jobs: uses: vmactions/freebsd-vm@v0 with: prepare: | - pkg install git cmake qt5-buildtools qt5-declarative qt5-multimedia qt5-qmake -y + env ASSUME_ALWAYS_YES=YES pkg update -f + env ASSUME_ALWAYS_YES=YES pkg install -y git cmake qt5-buildtools qt5-declarative qt5-multimedia qt5-qmake mkdir build cd build cmake .. @@ -115,10 +116,10 @@ jobs: uses: vmactions/openbsd-vm@v0 with: prepare: | - pkg_add git cmake qt5 -y + pkg_add -vv git cmake qt5 mkdir build cd build - cmake .. -DCMAKE_PREFIX_PATH:PATH=/usr/local/lib/qt5/cmak + cmake .. -DCMAKE_PREFIX_PATH:PATH=/usr/local/lib/qt5/cmake make - uses: actions/upload-artifact@v3 @@ -136,7 +137,7 @@ jobs: uses: vmactions/netbsd-vm@v0 with: prepare: | - pkgin install git cmake qt5-qtdeclarative qt5-qtmultimedia -y + /usr/sbin/pkg_add -vv git cmake qt5-qtdeclarative qt5-qtmultimedia -y mkdir build cd build cmake .. From 3b13e872f2218e69a962ed1d2390c5c066d5ee4a Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 23:22:02 +1300 Subject: [PATCH 16/35] Adds more RAM to VMs, moves to correct dir --- .github/workflows/build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60168599..f010e8a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,9 +93,12 @@ jobs: - name: Install Development Tools and Build Rclone Browser uses: vmactions/freebsd-vm@v0 with: + mem: 4096 prepare: | env ASSUME_ALWAYS_YES=YES pkg update -f env ASSUME_ALWAYS_YES=YES pkg install -y git cmake qt5-buildtools qt5-declarative qt5-multimedia qt5-qmake + pwd + cd work/RcloneBrowser/RcloneBrowser mkdir build cd build cmake .. @@ -115,8 +118,11 @@ jobs: - name: Install Development Tools and Build Rclone Browser uses: vmactions/openbsd-vm@v0 with: + mem: 4096 prepare: | pkg_add -vv git cmake qt5 + pwd + cd work/RcloneBrowser/RcloneBrowser mkdir build cd build cmake .. -DCMAKE_PREFIX_PATH:PATH=/usr/local/lib/qt5/cmake @@ -136,8 +142,11 @@ jobs: - name: Install Development Tools and Build Rclone Browser uses: vmactions/netbsd-vm@v0 with: + mem: 4096 prepare: | /usr/sbin/pkg_add -vv git cmake qt5-qtdeclarative qt5-qtmultimedia -y + pwd + cd work/RcloneBrowser/RcloneBrowser mkdir build cd build cmake .. From 4b47cf30ab5b36d90ff8eb8fbfd1c13d01db9ca2 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 23:23:47 +1300 Subject: [PATCH 17/35] Only execute this action on main or master --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f010e8a6..8e0f76af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,10 @@ name: Build Rclone Browser on: push: + branches: + - main + - master + workflow_dispatch: jobs: From 532da92c19c5925e4a9e8725b797582e8940cd23 Mon Sep 17 00:00:00 2001 From: Kid Date: Thu, 23 Mar 2023 23:53:43 +1300 Subject: [PATCH 18/35] Fix NetBSD Qt dependency problem --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e0f76af..d50842c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -148,7 +148,7 @@ jobs: with: mem: 4096 prepare: | - /usr/sbin/pkg_add -vv git cmake qt5-qtdeclarative qt5-qtmultimedia -y + /usr/sbin/pkg_add -vv git cmake qt5-* pwd cd work/RcloneBrowser/RcloneBrowser mkdir build From 9e814d7fbe11f3e2ccc2cefad6c02d93b7868ac7 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 00:16:17 +1300 Subject: [PATCH 19/35] Fix OpenBSD and NetBSD builds --- .github/workflows/build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d50842c4..485a1f09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -101,7 +101,6 @@ jobs: prepare: | env ASSUME_ALWAYS_YES=YES pkg update -f env ASSUME_ALWAYS_YES=YES pkg install -y git cmake qt5-buildtools qt5-declarative qt5-multimedia qt5-qmake - pwd cd work/RcloneBrowser/RcloneBrowser mkdir build cd build @@ -125,7 +124,6 @@ jobs: mem: 4096 prepare: | pkg_add -vv git cmake qt5 - pwd cd work/RcloneBrowser/RcloneBrowser mkdir build cd build @@ -148,12 +146,13 @@ jobs: with: mem: 4096 prepare: | - /usr/sbin/pkg_add -vv git cmake qt5-* - pwd + /usr/sbin/pkg_add -vv pkgin + pkgin update + pkgin install -V -y git cmake qt5-qtdeclarative cd work/RcloneBrowser/RcloneBrowser mkdir build cd build - cmake .. + cmake .. -DCMAKE_PREFIX_PATH:PATH=/usr/pkg/qt5 make - uses: actions/upload-artifact@v3 From 94b4b8193624fd33ad3cf0cb57164cb27b9970df Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 00:32:53 +1300 Subject: [PATCH 20/35] NetBSD Autoinstall --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 485a1f09..d2c4b256 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -148,7 +148,7 @@ jobs: prepare: | /usr/sbin/pkg_add -vv pkgin pkgin update - pkgin install -V -y git cmake qt5-qtdeclarative + pkgin -Vy install git cmake qt5-qtdeclarative cd work/RcloneBrowser/RcloneBrowser mkdir build cd build From d52e0a3e59b19cb6a4886d4749808bc61f292cae Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 00:42:10 +1300 Subject: [PATCH 21/35] Where does Windows put the binary? --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2c4b256..39580cbf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,9 @@ jobs: cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_PREFIX_PATH=C:\Qt\5.15.2\msvc2019_64 .. cmake --build . --config Release C:\Qt\5.15.2\msvc2019_64\bin\windeployqt.exe --no-translations --no-angle --no-compiler-runtime --no-svg ".\build\Release\RcloneBrowser.exe" + ls + ls .\build + ls .\build\Release - uses: actions/upload-artifact@v3 with: name: windows From 858a847555bf958f1299015df84379315c8bae99 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 08:03:29 +1300 Subject: [PATCH 22/35] Fix Windows artifacts, adds NetBSD MesaLib --- .github/workflows/build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39580cbf..5f6e7e48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,13 +38,10 @@ jobs: cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_PREFIX_PATH=C:\Qt\5.15.2\msvc2019_64 .. cmake --build . --config Release C:\Qt\5.15.2\msvc2019_64\bin\windeployqt.exe --no-translations --no-angle --no-compiler-runtime --no-svg ".\build\Release\RcloneBrowser.exe" - ls - ls .\build - ls .\build\Release - uses: actions/upload-artifact@v3 with: name: windows - path: .\build\Release\RcloneBrowser.exe + path: build\build\Release\* build_linux: name: Linux Build @@ -151,7 +148,7 @@ jobs: prepare: | /usr/sbin/pkg_add -vv pkgin pkgin update - pkgin -Vy install git cmake qt5-qtdeclarative + pkgin -Vy install git cmake qt5-qtdeclarative MesaLib cd work/RcloneBrowser/RcloneBrowser mkdir build cd build From 2f36faa8e3aca24e977715737fa6d3d102368e51 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 08:15:46 +1300 Subject: [PATCH 23/35] Hopefully fixes NetBSD --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f6e7e48..9cc42fda 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -148,7 +148,7 @@ jobs: prepare: | /usr/sbin/pkg_add -vv pkgin pkgin update - pkgin -Vy install git cmake qt5-qtdeclarative MesaLib + pkgin -Vy install git cmake qt5-qtdeclarative graphics/MesaLib cd work/RcloneBrowser/RcloneBrowser mkdir build cd build From f69a6a23b17f0bbb137103132a131fd7eda72f5c Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 10:34:39 +1300 Subject: [PATCH 24/35] Install QtMultimedia for NetBSD --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9cc42fda..692484d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -148,7 +148,7 @@ jobs: prepare: | /usr/sbin/pkg_add -vv pkgin pkgin update - pkgin -Vy install git cmake qt5-qtdeclarative graphics/MesaLib + pkgin -Vy install git cmake qt5-qtdeclarative qt5-qtmultimedia cd work/RcloneBrowser/RcloneBrowser mkdir build cd build From 98bb9e9d5660e7152fc0fa363adb85130ea60caa Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 10:45:57 +1300 Subject: [PATCH 25/35] Add OpenGL Libraries --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 692484d9..47c1ed02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -148,7 +148,7 @@ jobs: prepare: | /usr/sbin/pkg_add -vv pkgin pkgin update - pkgin -Vy install git cmake qt5-qtdeclarative qt5-qtmultimedia + pkgin -Vy install git cmake qt5-qtdeclarative qt5-qtmultimedia py39-OpenGL-3.1.5nb4 cd work/RcloneBrowser/RcloneBrowser mkdir build cd build From 2c1850b2ce93480b00ee31d27fe1002ca301c9a4 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 11:03:02 +1300 Subject: [PATCH 26/35] Removes NetBSD I can't figure it out. I'll leave it to someone much smarter than me --- .github/workflows/build.yml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47c1ed02..0f02ef99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,28 +134,3 @@ jobs: with: name: openbsd path: build/build/* - - build_netbsd: - name: NetBSD Build - runs-on: macos-12 - - steps: - - uses: actions/checkout@v3 - - name: Install Development Tools and Build Rclone Browser - uses: vmactions/netbsd-vm@v0 - with: - mem: 4096 - prepare: | - /usr/sbin/pkg_add -vv pkgin - pkgin update - pkgin -Vy install git cmake qt5-qtdeclarative qt5-qtmultimedia py39-OpenGL-3.1.5nb4 - cd work/RcloneBrowser/RcloneBrowser - mkdir build - cd build - cmake .. -DCMAKE_PREFIX_PATH:PATH=/usr/pkg/qt5 - make - - - uses: actions/upload-artifact@v3 - with: - name: netbsd - path: build/build/* From 924fd46724db6dafb5f15fcd700979016aba4ae9 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 11:20:38 +1300 Subject: [PATCH 27/35] Adds automatic GitHub Release action --- .github/workflows/build.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f02ef99..e9dca580 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,3 +134,34 @@ jobs: with: name: openbsd path: build/build/* + + create_release: + name: Create GitHub Release + runs-on: ubuntu-latest + + steps: + - name: Create artifact directory + run: mkdir /tmp/artifacts + - uses: actions/download-artifact@v3 + with: + path: /tmp/artifacts + - name: Compress artifacts + run: | + pushd /tmp/artifacts + for i in *;do zip -r -0 $i $i.zip;done + popd + + - name: Get short commit + run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV + + - uses: ncipollo/release-action@v1 + with: + artifacts: "/tmp/artifacts/*.zip" + name: Rclone Browser Autobuild For Commit ${{ env.SHORT_SHA }} + omitBody: true + generateReleaseNotes: true + commit: ${{ env.SHORT_SHA }} + prerelease: true + skipIfReleaseExists: true + tag: ${{ env.SHORT_SHA }} + From 02993a4135a94449dbf77e4f60a2dff362531c87 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 11:22:59 +1300 Subject: [PATCH 28/35] Fix release action --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9dca580..5761f182 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -138,6 +138,7 @@ jobs: create_release: name: Create GitHub Release runs-on: ubuntu-latest + needs: [build_windows, build_linux, build_macos, build_freebsd, build_openbsd] steps: - name: Create artifact directory From 379940cf94c5867474b0dc9b4124661369344bf9 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 11:34:51 +1300 Subject: [PATCH 29/35] Removes OpenBSD I'm not smart enough for this --- .github/workflows/build.yml | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5761f182..fb5d8f3e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,34 +111,11 @@ jobs: with: name: freebsd path: build/build/* - - build_openbsd: - name: OpenBSD Build - runs-on: macos-12 - - steps: - - uses: actions/checkout@v3 - - name: Install Development Tools and Build Rclone Browser - uses: vmactions/openbsd-vm@v0 - with: - mem: 4096 - prepare: | - pkg_add -vv git cmake qt5 - cd work/RcloneBrowser/RcloneBrowser - mkdir build - cd build - cmake .. -DCMAKE_PREFIX_PATH:PATH=/usr/local/lib/qt5/cmake - make - - - uses: actions/upload-artifact@v3 - with: - name: openbsd - path: build/build/* create_release: name: Create GitHub Release runs-on: ubuntu-latest - needs: [build_windows, build_linux, build_macos, build_freebsd, build_openbsd] + needs: [build_windows, build_linux, build_macos, build_freebsd] steps: - name: Create artifact directory From 31d72efe0f347cbfe9dff93e8e795730faaa8cd4 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 12:17:06 +1300 Subject: [PATCH 30/35] Fix release action --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb5d8f3e..77ba62a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -126,7 +126,7 @@ jobs: - name: Compress artifacts run: | pushd /tmp/artifacts - for i in *;do zip -r -0 $i $i.zip;done + for i in *;do zip -r -0 $i.zip $i;done popd - name: Get short commit From 254c4163f770f3a90e859d66f1707652ae682f19 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 12:43:57 +1300 Subject: [PATCH 31/35] Create GitHub tag before release --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77ba62a8..f0555976 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -132,6 +132,12 @@ jobs: - name: Get short commit run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV + - uses: rickstaa/action-create-tag@v1 + id: "tag_create" + with: + tag: ${{ env.SHORT_SHA }} + tag_exists_error: false + - uses: ncipollo/release-action@v1 with: artifacts: "/tmp/artifacts/*.zip" From a68d00d8b791bef7bd9eb42e393d2a899661b48e Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 13:04:41 +1300 Subject: [PATCH 32/35] Adds actions checkout --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0555976..5be834b2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,6 +118,7 @@ jobs: needs: [build_windows, build_linux, build_macos, build_freebsd] steps: + - uses: actions/checkout@v3 - name: Create artifact directory run: mkdir /tmp/artifacts - uses: actions/download-artifact@v3 @@ -133,7 +134,6 @@ jobs: run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - uses: rickstaa/action-create-tag@v1 - id: "tag_create" with: tag: ${{ env.SHORT_SHA }} tag_exists_error: false From 7d89b2bfb90adc8ab2bc12a7ca626e5adf6e88b5 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 13:31:38 +1300 Subject: [PATCH 33/35] Fixes release action --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5be834b2..29f889b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,7 +135,7 @@ jobs: - uses: rickstaa/action-create-tag@v1 with: - tag: ${{ env.SHORT_SHA }} + tag: release-${{ env.SHORT_SHA }} tag_exists_error: false - uses: ncipollo/release-action@v1 @@ -144,8 +144,7 @@ jobs: name: Rclone Browser Autobuild For Commit ${{ env.SHORT_SHA }} omitBody: true generateReleaseNotes: true - commit: ${{ env.SHORT_SHA }} prerelease: true skipIfReleaseExists: true - tag: ${{ env.SHORT_SHA }} + tag: release-${{ env.SHORT_SHA }} From cad0c64d3ec32e647873e35d5b4c0f27bbf8f3a8 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 14:11:28 +1300 Subject: [PATCH 34/35] Don't compress the macOS app It causes issues with releases --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29f889b6..7bc459cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,11 +82,10 @@ jobs: cd build /usr/local/opt/qt@5/bin/macdeployqt rclone-browser.app -executable="rclone-browser.app/Contents/MacOS/rclone-browser" -qmldir=../src/ mv rclone-browser.app Rclone\ Browser.app - zip -r -0 Rclone\ Browser.zip Rclone\ Browser.app - uses: actions/upload-artifact@v3 with: name: macos - path: build/build/*.zip + path: build/build/* build_freebsd: name: FreeBSD Build From d0c69eeff9b24582ce28dc81aa177737a6d592be Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 24 Mar 2023 14:38:47 +1300 Subject: [PATCH 35/35] Remove directories that might exist before population --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7bc459cf..c181b92f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,6 +23,7 @@ jobs: python get-pip.py refreshenv pip install py7zr lxml requests semantic-version + Remove-Item -Recurse -Force C:\Qt mkdir C:\Qt pushd C:\Qt git clone https://github.com/engnr/qt-downloader.git @@ -119,7 +120,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Create artifact directory - run: mkdir /tmp/artifacts + run: rm -rf /tmp/artifacts && mkdir /tmp/artifacts - uses: actions/download-artifact@v3 with: path: /tmp/artifacts