From 3e56f8c9172ecca3517c06cc0ace8174a2c51b4b Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Jun 2021 17:56:56 -0700 Subject: [PATCH 01/14] drone windows msix --- .drone.yml | 11 ++++++++++- pubspec.yaml | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4105fd6..24d615f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -218,9 +218,14 @@ steps: - git describe --tags > VERSION - powershell -command "Get-Date -Format 'yyyy-MM-dd-HH-mm'" > BUILDDATE - .\fetch-libcwtch-go.ps1 - - + - name: build-windows image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc + environment: + pfx: + from_secret: pfx + pfx_pass: + from_secret: pfx_pass commands: - flutter pub get # flwtch-`cat VERSION`-`cat BUILDDATE` @@ -237,6 +242,10 @@ steps: - $Env:sha = $Env:zip - $Env:sha += '.sha512' - flutter build windows --dart-define BUILD_VER=$Env:version --dart-define BUILD_DATE=$Env:builddate + - echo $Env:pfx > codesign.pfx.b64 + - certutil -decode codesign.pfx.b64 codesign.pfx + - (Get-Content -path pubspec.yaml -Raw) -replace 'pfx_pass',"$Env:pfx_pass" > pubspec.yaml + - flutter pub run msix:create - mkdir deploy - move build\\windows\\runner\\Release $Env:builddir - copy windows\libCwtch.dll $Env:builddir diff --git a/pubspec.yaml b/pubspec.yaml index 6f843e1..0f20905 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -51,6 +51,8 @@ dependencies: path: plugins/window_size ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81 +dev_dependencies: + msix: ^2.1.3 # Uncomment to update lokalise translations (see README for list of deps to comment out bc incompatibilities) #dev_dependencies: # flutter_lokalise: any @@ -116,3 +118,19 @@ flutter: # # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages + + +msix_config: + display_name: Cwtch + publisher_display_name: Open Privacy Research Society + identity_name: im.cwtch.flwtch + msix_version: 1.0.0.0 + certificate_path: codesign.pfx + certificate_password: pfx_pass + publisher: CN=Open Privacy Research Society, O=Open Privacy Research Society, L=Vancouver, S=BC, C=CA + logo_path: cwtch.png + start_menu_icon_path: cwtch.png + tile_icon_path: assets\cwtch_title.png + icons_background_color: transparent + architecture: x64 + capabilities: 'internetClient' From ae2ae51d2dfca23e920468b5144842387edcf33e Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Jun 2021 18:10:52 -0700 Subject: [PATCH 02/14] drone windows msix powershell cant read and pipe write to the same file... --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 24d615f..99b40a4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -244,7 +244,8 @@ steps: - flutter build windows --dart-define BUILD_VER=$Env:version --dart-define BUILD_DATE=$Env:builddate - echo $Env:pfx > codesign.pfx.b64 - certutil -decode codesign.pfx.b64 codesign.pfx - - (Get-Content -path pubspec.yaml -Raw) -replace 'pfx_pass',"$Env:pfx_pass" > pubspec.yaml + - move pubspec.yaml pubspec.yaml.orig + - (Get-Content -path pubspec.yaml.orig -Raw) -replace 'pfx_pass',"$Env:pfx_pass" > pubspec.yaml - flutter pub run msix:create - mkdir deploy - move build\\windows\\runner\\Release $Env:builddir From da8a35458fbaf65938f2080de25d3f035e55726e Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Jun 2021 18:35:36 -0700 Subject: [PATCH 03/14] drone windows msix powershell Set-Content for utf not > --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 99b40a4..7f51488 100644 --- a/.drone.yml +++ b/.drone.yml @@ -245,7 +245,7 @@ steps: - echo $Env:pfx > codesign.pfx.b64 - certutil -decode codesign.pfx.b64 codesign.pfx - move pubspec.yaml pubspec.yaml.orig - - (Get-Content -path pubspec.yaml.orig -Raw) -replace 'pfx_pass',"$Env:pfx_pass" > pubspec.yaml + - (Get-Content -path pubspec.yaml.orig -Raw) -replace 'pfx_pass',"$Env:pfx_pass" | Set-Content -path pubspec.yaml  - flutter pub run msix:create - mkdir deploy - move build\\windows\\runner\\Release $Env:builddir From 66568a79835b981aa0bd8317a054f3884780d80f Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Jun 2021 18:47:52 -0700 Subject: [PATCH 04/14] drone windows msix do pubspec.yaml sub before flutter get --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7f51488..7bbee55 100644 --- a/.drone.yml +++ b/.drone.yml @@ -227,6 +227,8 @@ steps: pfx_pass: from_secret: pfx_pass commands: + - move pubspec.yaml pubspec.yaml.orig + - (Get-Content -path pubspec.yaml.orig -Raw) -replace 'pfx_pass',"$Env:pfx_pass" | Set-Content -path pubspec.yaml  - flutter pub get # flwtch-`cat VERSION`-`cat BUILDDATE` - $Env:buildname = 'flwtch-win-' @@ -244,8 +246,6 @@ steps: - flutter build windows --dart-define BUILD_VER=$Env:version --dart-define BUILD_DATE=$Env:builddate - echo $Env:pfx > codesign.pfx.b64 - certutil -decode codesign.pfx.b64 codesign.pfx - - move pubspec.yaml pubspec.yaml.orig - - (Get-Content -path pubspec.yaml.orig -Raw) -replace 'pfx_pass',"$Env:pfx_pass" | Set-Content -path pubspec.yaml  - flutter pub run msix:create - mkdir deploy - move build\\windows\\runner\\Release $Env:builddir From f7c30755d069240bd25253c3ef548d37183cc7c6 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Jun 2021 21:15:35 -0700 Subject: [PATCH 05/14] remove pub pligin window_size --- pubspec.lock | 18 +++++++++--------- pubspec.yaml | 11 ++++++----- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 3db29ce..f827e45 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -428,15 +428,15 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.1" - window_size: - dependency: "direct main" - description: - path: "plugins/window_size" - ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81 - resolved-ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81 - url: "git://github.com/google/flutter-desktop-embedding.git" - source: git - version: "0.1.0" +# window_size: +# dependency: "direct main" +# description: +# path: "plugins/window_size" +# ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81 +# resolved-ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81 +# url: "git://github.com/google/flutter-desktop-embedding.git" +# source: git +# version: "0.1.0" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 9db1922..8b9ed1a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -45,11 +45,12 @@ dependencies: flutter_driver: sdk: flutter - window_size: - git: - url: git://github.com/google/flutter-desktop-embedding.git - path: plugins/window_size - ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81 +# Deprecated? +# window_size: +# git: +# url: git://github.com/google/flutter-desktop-embedding.git +# path: plugins/window_size +# ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81 dev_dependencies: msix: ^2.1.3 From a54d50a642070a4403645eeedb1d62afaf89af30 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Jun 2021 22:18:31 -0700 Subject: [PATCH 06/14] drone window: rework order, variables, so dlls and tor are in msix; remove pub pligin window_size --- .drone.yml | 42 ++++++++++++++++++------------------------ pubspec.lock | 9 --------- pubspec.yaml | 7 ------- 3 files changed, 18 insertions(+), 40 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7bbee55..516b6d9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -230,38 +230,32 @@ steps: - move pubspec.yaml pubspec.yaml.orig - (Get-Content -path pubspec.yaml.orig -Raw) -replace 'pfx_pass',"$Env:pfx_pass" | Set-Content -path pubspec.yaml  - flutter pub get - # flwtch-`cat VERSION`-`cat BUILDDATE` - - $Env:buildname = 'flwtch-win-' - $Env:version += type .\VERSION - - $Env:buildname += $Env:version - - $Env:buildname += '-' - $Env:builddate += type .\BUILDDATE - - $Env:buildname += $Env:builddate - - $Env:builddir += $Env:buildname - - $Env:zip = 'cwtch-' - - $Env:zip += $Env:version - - $Env:zip += '.zip' - - $Env:sha = $Env:zip - - $Env:sha += '.sha512' + - $Env:buildname = 'flwtch-win-' + $Env:version + '-' + $Env:builddate + - $Env:builddir = $Env:buildname + - $Env:zip = 'cwtch-' + $Env:version + '.zip' + - $Env:zipsha = $Env:zip + '.sha512' + - $Env:msix = 'cwtch-install-' + $Env:version + '.msix' + - $Env:msixsha = $Env:msix + '.sha512' + - $Env:releasedir = "build\\windows\\runner\\Release\\" - flutter build windows --dart-define BUILD_VER=$Env:version --dart-define BUILD_DATE=$Env:builddate + - copy windows\libCwtch.dll $Env:releasedir + # flutter hasn't worked out it's packaging of required dll's so we have to resort to this manual nonsense + # https://github.com/google/flutter-desktop-embedding/issues/587 + # https://github.com/flutter/flutter/issues/53167 + - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140.dll $Env:releasedir + - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140_1.dll $Env:releasedir + - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\msvcp140.dll $Env:releasedir + - powershell -command "Expand-Archive -Path tor.zip -DestinationPath $Env:releasedir\Tor" - echo $Env:pfx > codesign.pfx.b64 - certutil -decode codesign.pfx.b64 codesign.pfx - flutter pub run msix:create - mkdir deploy - - move build\\windows\\runner\\Release $Env:builddir - - copy windows\libCwtch.dll $Env:builddir - # flutter hasn't worked out it's packaging of required dll's so we have to resort to this manual nonsense - # https://github.com/google/flutter-desktop-embedding/issues/587 - # https://github.com/flutter/flutter/issues/53167 - - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140.dll $Env:builddir - - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140_1.dll $Env:builddir - - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\msvcp140.dll $Env:builddir - - powershell -command "Expand-Archive -Path tor.zip -DestinationPath $Env:builddir\Tor" - - powershell -command "Compress-Archive -Path $Env:builddir -DestinationPath $Env:zip" - - powershell -command "(Get-FileHash *.zip -Algorithm sha512).Hash" > $Env:sha - mkdir deploy\$Env:builddir - - move $Env:zip deploy\$Env:builddir - - move $Env:sha deploy\$Env:builddir + - move "${Env:releasedir}cwtch.msix" "deploy\\${Env:builddir}\\${Env:msix}" + - powershell -command "Compress-Archive -Path $Env:releasedir -DestinationPath deploy\$Env:builddir\$Env:zip" + - powershell -command "(Get-FileHash deploy\$Env:builddir\$Env:zip -Algorithm sha512).Hash" > deploy\$Env:builddir\$Env:sha - name: deploy-windows image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc diff --git a/pubspec.lock b/pubspec.lock index f827e45..c59f48b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -428,15 +428,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.1" -# window_size: -# dependency: "direct main" -# description: -# path: "plugins/window_size" -# ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81 -# resolved-ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81 -# url: "git://github.com/google/flutter-desktop-embedding.git" -# source: git -# version: "0.1.0" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 8b9ed1a..b4955e3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -45,13 +45,6 @@ dependencies: flutter_driver: sdk: flutter -# Deprecated? -# window_size: -# git: -# url: git://github.com/google/flutter-desktop-embedding.git -# path: plugins/window_size -# ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81 - dev_dependencies: msix: ^2.1.3 # Uncomment to update lokalise translations (see README for list of deps to comment out bc incompatibilities) From 901293377ec5d1301b846303c42618a295e03cff Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Jun 2021 22:41:05 -0700 Subject: [PATCH 07/14] drone windows msix debug --- .drone.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 516b6d9..9200020 100644 --- a/.drone.yml +++ b/.drone.yml @@ -228,7 +228,7 @@ steps: from_secret: pfx_pass commands: - move pubspec.yaml pubspec.yaml.orig - - (Get-Content -path pubspec.yaml.orig -Raw) -replace 'pfx_pass',"$Env:pfx_pass" | Set-Content -path pubspec.yaml  + - (Get-Content -path pubspec.yaml.orig -Raw) -Replace 'pfx_pass',"$Env:pfx_pass" | Set-Content -path pubspec.yaml - flutter pub get - $Env:version += type .\VERSION - $Env:builddate += type .\BUILDDATE @@ -239,6 +239,7 @@ steps: - $Env:msix = 'cwtch-install-' + $Env:version + '.msix' - $Env:msixsha = $Env:msix + '.sha512' - $Env:releasedir = "build\\windows\\runner\\Release\\" + - echo $Env:releasedir - flutter build windows --dart-define BUILD_VER=$Env:version --dart-define BUILD_DATE=$Env:builddate - copy windows\libCwtch.dll $Env:releasedir # flutter hasn't worked out it's packaging of required dll's so we have to resort to this manual nonsense @@ -248,6 +249,7 @@ steps: - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140_1.dll $Env:releasedir - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\msvcp140.dll $Env:releasedir - powershell -command "Expand-Archive -Path tor.zip -DestinationPath $Env:releasedir\Tor" + - dir $Env:releasedir - echo $Env:pfx > codesign.pfx.b64 - certutil -decode codesign.pfx.b64 codesign.pfx - flutter pub run msix:create From 5f6008a1522f87c300df89e63ea7dfa1c8fd3dac Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Jun 2021 23:01:12 -0700 Subject: [PATCH 08/14] drone windows msix debug --- .drone.yml | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9200020..25fe9a0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -255,7 +255,7 @@ steps: - flutter pub run msix:create - mkdir deploy - mkdir deploy\$Env:builddir - - move "${Env:releasedir}cwtch.msix" "deploy\\${Env:builddir}\\${Env:msix}" + - powershell -command "move $Env:releasedir\cwtch.msix deploy\$Env:builddir\$Env:msix" - powershell -command "Compress-Archive -Path $Env:releasedir -DestinationPath deploy\$Env:builddir\$Env:zip" - powershell -command "(Get-FileHash deploy\$Env:builddir\$Env:zip -Algorithm sha512).Hash" > deploy\$Env:builddir\$Env:sha diff --git a/pubspec.yaml b/pubspec.yaml index b4955e3..7e0eca9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -121,7 +121,7 @@ msix_config: msix_version: 1.0.0.0 certificate_path: codesign.pfx certificate_password: pfx_pass - publisher: CN=Open Privacy Research Society, O=Open Privacy Research Society, L=Vancouver, S=BC, C=CA + publisher: CN=Open Privacy Research Society, O=Open Privacy Research Society, L=Vancouver, S=British Columbia, C=CA logo_path: cwtch.png start_menu_icon_path: cwtch.png tile_icon_path: assets\cwtch_title.png From 0a93dd40b6c6b96c4ecbc89a613b888c81d57ce2 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Jun 2021 23:16:35 -0700 Subject: [PATCH 09/14] drone windows compress archive is dumb --- .drone.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 25fe9a0..dd3239e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -256,7 +256,9 @@ steps: - mkdir deploy - mkdir deploy\$Env:builddir - powershell -command "move $Env:releasedir\cwtch.msix deploy\$Env:builddir\$Env:msix" - - powershell -command "Compress-Archive -Path $Env:releasedir -DestinationPath deploy\$Env:builddir\$Env:zip" + - move $Env:releasedir $Env:builddir + - powershell -command "Compress-Archive -Path $Env:builddir -DestinationPath $Env:zip" + - powershell -command "move $Env:zip deploy\$Env:builddir\" - powershell -command "(Get-FileHash deploy\$Env:builddir\$Env:zip -Algorithm sha512).Hash" > deploy\$Env:builddir\$Env:sha - name: deploy-windows From 4e0be2093026e40e94998e061b4e464027faf638 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Jun 2021 23:27:35 -0700 Subject: [PATCH 10/14] drone windows is dumb --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index dd3239e..798ea0b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -258,7 +258,7 @@ steps: - powershell -command "move $Env:releasedir\cwtch.msix deploy\$Env:builddir\$Env:msix" - move $Env:releasedir $Env:builddir - powershell -command "Compress-Archive -Path $Env:builddir -DestinationPath $Env:zip" - - powershell -command "move $Env:zip deploy\$Env:builddir\" + - move $Env:zip deploy\$Env:builddir - powershell -command "(Get-FileHash deploy\$Env:builddir\$Env:zip -Algorithm sha512).Hash" > deploy\$Env:builddir\$Env:sha - name: deploy-windows From 6c0c31a74f838f35608ec6f618eb5a5cd4980367 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Jun 2021 23:50:55 -0700 Subject: [PATCH 11/14] drone windows is dumb --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 798ea0b..5912fed 100644 --- a/.drone.yml +++ b/.drone.yml @@ -258,7 +258,7 @@ steps: - powershell -command "move $Env:releasedir\cwtch.msix deploy\$Env:builddir\$Env:msix" - move $Env:releasedir $Env:builddir - powershell -command "Compress-Archive -Path $Env:builddir -DestinationPath $Env:zip" - - move $Env:zip deploy\$Env:builddir + - move $Env:zip deploy\\$Env:builddir - powershell -command "(Get-FileHash deploy\$Env:builddir\$Env:zip -Algorithm sha512).Hash" > deploy\$Env:builddir\$Env:sha - name: deploy-windows From ff4a8a02ab138d6cdf4a62f4ae85ba7761488a29 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Thu, 24 Jun 2021 00:01:29 -0700 Subject: [PATCH 12/14] drone windows hyper dumb --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 5912fed..f67ac61 100644 --- a/.drone.yml +++ b/.drone.yml @@ -258,7 +258,7 @@ steps: - powershell -command "move $Env:releasedir\cwtch.msix deploy\$Env:builddir\$Env:msix" - move $Env:releasedir $Env:builddir - powershell -command "Compress-Archive -Path $Env:builddir -DestinationPath $Env:zip" - - move $Env:zip deploy\\$Env:builddir + - powershell -command "move $Env:zip deploy\${Env:builddir}" - powershell -command "(Get-FileHash deploy\$Env:builddir\$Env:zip -Algorithm sha512).Hash" > deploy\$Env:builddir\$Env:sha - name: deploy-windows From ca303ba41c634098e8b40fee3255b3f5243ea2a2 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Thu, 24 Jun 2021 00:12:37 -0700 Subject: [PATCH 13/14] drone windows hyper dumb --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f67ac61..abeb270 100644 --- a/.drone.yml +++ b/.drone.yml @@ -255,10 +255,11 @@ steps: - flutter pub run msix:create - mkdir deploy - mkdir deploy\$Env:builddir + - dir deploy - powershell -command "move $Env:releasedir\cwtch.msix deploy\$Env:builddir\$Env:msix" - move $Env:releasedir $Env:builddir - powershell -command "Compress-Archive -Path $Env:builddir -DestinationPath $Env:zip" - - powershell -command "move $Env:zip deploy\${Env:builddir}" + - powershell -command "move $Env:zip 'deploy\\' + $Env:builddir" - powershell -command "(Get-FileHash deploy\$Env:builddir\$Env:zip -Algorithm sha512).Hash" > deploy\$Env:builddir\$Env:sha - name: deploy-windows From c533580b705a736f6e75fabb2148811fb1791246 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Thu, 24 Jun 2021 00:26:43 -0700 Subject: [PATCH 14/14] drone windows hyper dumb --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index abeb270..f6c3a52 100644 --- a/.drone.yml +++ b/.drone.yml @@ -240,6 +240,7 @@ steps: - $Env:msixsha = $Env:msix + '.sha512' - $Env:releasedir = "build\\windows\\runner\\Release\\" - echo $Env:releasedir + - echo $Env:builddir - flutter build windows --dart-define BUILD_VER=$Env:version --dart-define BUILD_DATE=$Env:builddate - copy windows\libCwtch.dll $Env:releasedir # flutter hasn't worked out it's packaging of required dll's so we have to resort to this manual nonsense @@ -259,7 +260,7 @@ steps: - powershell -command "move $Env:releasedir\cwtch.msix deploy\$Env:builddir\$Env:msix" - move $Env:releasedir $Env:builddir - powershell -command "Compress-Archive -Path $Env:builddir -DestinationPath $Env:zip" - - powershell -command "move $Env:zip 'deploy\\' + $Env:builddir" + - powershell -command "move $Env:zip deploy\$Env:builddir\" - powershell -command "(Get-FileHash deploy\$Env:builddir\$Env:zip -Algorithm sha512).Hash" > deploy\$Env:builddir\$Env:sha - name: deploy-windows