Distribution and Signing (#249)

bluecherrydvr · Jul 9, 2024 · 7c4339a · 7c4339a
2 parents 90693a6 + 6150311
commit 7c4339a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
             bluecherry-android-armeabi-v7a-release.apk
             bluecherry-android-x86_64-release.apk
           token: ${{ secrets.GITHUB_TOKEN }}
-      
+
       - name: Release
         # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-using-contexts
         if: startsWith(github.ref, 'refs/tags/')
@@ -84,7 +84,7 @@ jobs:
           channel: "stable"
           architecture: x64
           # cache: true
-          
+
       - run: flutter gen-l10n
       - run: flutter pub get
       - run: flutter build ios --verbose --no-codesign
@@ -126,7 +126,7 @@ jobs:
           channel: "stable"
           architecture: x64
           # cache: true
-          
+
       - run: flutter gen-l10n
       - run: flutter pub get
       - run: flutter build macos --verbose
@@ -171,6 +171,20 @@ jobs:
       - run: flutter pub get
       - run: flutter build windows --verbose
 
+      - name: Copy VSCode redistribution libs over
+        shell: powershell
+        working-directory: .\build\windows\x64\runner\Release
+        # Copy the latest vscode redistribution .dll files into the folder as per
+        # https://docs.flutter.dev/platform-integration/windows/building#distributing-windows-apps
+        # to fix crash issues like:
+        # https://github.com/media-kit/media-kit/issues/842
+        run: |
+          Copy-Item (& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find 'VC\Redist\MSVC\*\x64\*\msvcp140.dll') -Force .
+          Copy-Item (& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find 'VC\Redist\MSVC\*\x64\*\msvcp140_1.dll') -Force .
+          Copy-Item (& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find 'VC\Redist\MSVC\*\x64\*\msvcp140_2.dll') -Force .
+          Copy-Item (& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find 'VC\Redist\MSVC\*\x64\*\vcruntime140.dll') -Force .
+          Copy-Item (& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find 'VC\Redist\MSVC\*\x64\*\vcruntime140_1.dll') -Force .
+
       - name: Building the installer
         run: |
           "%programfiles(x86)%\Inno Setup 6\iscc.exe" "installer/windows-installer.iss"
@@ -220,7 +234,7 @@ jobs:
         with:
           channel: "stable"
           # cache: true
-      
+
       - name: Initiate Flutter
         run: |
           flutter gen-l10n
@@ -236,7 +250,7 @@ jobs:
           mkdir -p linux/debian/usr/bin
           cp -fr build/linux/x64/release/bundle linux/debian/usr/share/bluecherry_client
           ln -sr linux/debian/usr/share/bluecherry_client/bluecherry_client linux/debian/usr/bin/bluecherry_client
-          
+
           sed -i "s:cp -rf :cp -rf $(pwd)/:" linux/rpm/bluecherry.spec
           cd linux/debian
           sed -i "s:FILES_HERE:$(find usr \( -type l -o -type f \) -follow -print | awk '{printf "/%s\\n", $0}'):" ../rpm/bluecherry.spec
@@ -342,7 +356,7 @@ jobs:
         with:
           channel: "stable"
           cache: false
-      
+
       - name: Initiate Flutter
         run: |
           flutter gen-l10n
@@ -368,13 +382,12 @@ jobs:
         with:
           channel: "stable"
           cache: false
-      
+
       - name: Initiate Flutter
         run: |
           flutter gen-l10n
           flutter pub get
-        
+
       - name: Build
         run: |
           flutter build web --verbose --dart-define=FLUTTER_WEB_USE_SKIA=true --dart-define=FLUTTER_WEB_AUTO_DETECT=true
-
diff --git a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
@@ -3,8 +3,8 @@ FLUTTER_ROOT=C:\Users\bruno\Documents\flutter\flutter
 FLUTTER_APPLICATION_PATH=C:\Users\bruno\Documents\flutter\paid_projects\unity
 COCOAPODS_PARALLEL_CODE_SIGN=true
 FLUTTER_BUILD_DIR=build
-FLUTTER_BUILD_NAME=3.0.016
-FLUTTER_BUILD_NUMBER=3.0.016
+FLUTTER_BUILD_NAME=3.0.017
+FLUTTER_BUILD_NUMBER=3.0.017
 DART_OBFUSCATION=false
 TRACK_WIDGET_CREATION=true
 TREE_SHAKE_ICONS=false

diff --git a/macos/Flutter/ephemeral/flutter_export_environment.sh b/macos/Flutter/ephemeral/flutter_export_environment.sh
@@ -4,8 +4,8 @@ export "FLUTTER_ROOT=C:\Users\bruno\Documents\flutter\flutter"
 export "FLUTTER_APPLICATION_PATH=C:\Users\bruno\Documents\flutter\paid_projects\unity"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=3.0.016"
-export "FLUTTER_BUILD_NUMBER=3.0.016"
+export "FLUTTER_BUILD_NAME=3.0.017"
+export "FLUTTER_BUILD_NUMBER=3.0.017"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=true"
 export "TREE_SHAKE_ICONS=false"