Merge remote-tracking branch 'upstream/main'

jeremyd2019 · Dec 8, 2024 · 15887f4 · 15887f4
2 parents 8de1983 + 3cf8b7e
commit 15887f4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: setup-msys2
         uses: msys2/setup-msys2@v2
@@ -72,6 +74,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - uses: actions/download-artifact@v4
         with:
@@ -108,6 +112,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - uses: actions/download-artifact@v4
         with:
@@ -141,6 +147,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - uses: actions/download-artifact@v4
         with:

diff --git a/qt-ifw/config/config.xml b/qt-ifw/config/config.xml
@@ -11,6 +11,8 @@
     <InstallerApplicationIcon>msys2</InstallerApplicationIcon>
     <InstallerWindowIcon>msys2.ico</InstallerWindowIcon>
     <InstallActionColumnVisible>false</InstallActionColumnVisible>
+    <WizardStyle>Modern</WizardStyle>
+    <WizardDefaultWidth>40em</WizardDefaultWidth>
     <MaintenanceToolName>uninstall</MaintenanceToolName>
     <SupportsModify>false</SupportsModify>
     <RepositorySettingsPageVisible>false</RepositorySettingsPageVisible>

diff --git a/qt-ifw/packages/com.msys2.root/meta/installscript.js b/qt-ifw/packages/com.msys2.root/meta/installscript.js
@@ -34,7 +34,6 @@ function createShortcuts()
         return;
     }
 
-    component.addOperation("CreateShortcut", "@TargetDir@/mingw32.exe", "@StartMenuDir@/MSYS2 MINGW32.lnk", "iconPath=@TargetDir@/mingw32.exe");
     component.addOperation("CreateShortcut", "@TargetDir@/mingw64.exe", "@StartMenuDir@/MSYS2 MINGW64.lnk", "iconPath=@TargetDir@/mingw64.exe");
     component.addOperation("CreateShortcut", "@TargetDir@/ucrt64.exe", "@StartMenuDir@/MSYS2 UCRT64.lnk", "iconPath=@TargetDir@/ucrt64.exe");
     component.addOperation("CreateShortcut", "@TargetDir@/clang64.exe", "@StartMenuDir@/MSYS2 CLANG64.lnk", "iconPath=@TargetDir@/clang64.exe");