fix: mingw version

Author: abeimler

dev/docker/__tests__/arch.mingw.dockerfile

@@ -29,8 +29,8 @@ RUN pacman -Syuu --noconfirm && \
 
 ENTRYPOINT ["/bin/bash"]
 
-#### Building (example)
-FROM setup-cpp-arch AS builder
+#### Cross Building (example)
+FROM setup-cpp-arch-mingw AS builder
 
 COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app

dev/docker/__tests__/fedora.mingw.dockerfile

@@ -33,4 +33,3 @@ COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app
 RUN bash -c 'source ~/.cpprc \
     && task build_cross_mingw'
-

dev/docker/__tests__/ubuntu.mingw.dockerfile

@@ -32,8 +32,8 @@ RUN apt-get update -qq && \
 
 ENTRYPOINT ["/bin/bash"]
 
-#### Building (example)
-FROM setup-cpp-ubuntu AS builder
+#### Cross Building (example)
+FROM setup-cpp-ubuntu-mingw AS builder
 
 COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app

src/compilers.ts

@@ -60,7 +60,7 @@ export async function installCompiler(
       case "mingw":
       case "cygwin":
       case "msys": {
-        const gccVersion = getVersion("gcc", version, osVersion)
+        const gccVersion = (compiler === "mingw")? getVersion("mingw", version, osVersion) : getVersion("gcc", version, osVersion)
         const installationInfo = (compiler === "mingw")? await setupMingw(gccVersion, join(setupCppDir, "gcc"), arch) : await setupGcc(gccVersion, join(setupCppDir, "gcc"), arch)
 
         if (hasLLVM) {

src/gcc/gcc.ts

@@ -151,7 +151,7 @@ export async function setupMingw(version: string, setupDir: string, arch: string
     }
     case "linux": {
       if (isArch()) {
-        installationInfo = await setupPacmanPack("mingw-w64", version, "yay")
+        installationInfo = await setupPacmanPack("mingw-w64-gcc", version)
       } else if (hasDnf()) {
         installationInfo = await setupDnfPack([
           { name: "mingw64-gcc", version },

src/versions/default_versions.ts

@@ -28,6 +28,7 @@ export const DefaultVersions: Record<string, string | undefined> = {
   task: "3.25.0", // https://github.com/go-task/task/releases
   doxygen: isArch() ? "1.9.6-1" : "1.9.7", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen // https://formulae.brew.sh/formula/doxygen // https://archlinux.org/packages/extra/x86_64/doxygen/
   gcc: isArch() ? "13.1.1-1" : "13", // https://github.com/brechtsanders/winlibs_mingw/releases and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc
+  //mingw: isArch() ? "12.2.0-1" : "8", // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=mingw-w64 // https://archlinux.org/packages/extra/x86_64/mingw-w64-gcc/
 }
 
 export const MinVersions: Record<string, string | undefined> = {
@@ -46,6 +47,10 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
     16: "11",
     14: "11",
   },
+  mingw: {
+    22: "8.0.0-1",
+    20: "7.0.0-2",
+  },
   llvm: {
     22: "15.0.6-ubuntu-18.04",
     20: "15.0.6-ubuntu-18.04",