Refactor CI

uyjulian · Jul 27, 2023 · 11375ee · 11375ee
1 parent ec9d4d5
commit 11375ee
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,12 +80,8 @@
           ]
         }
       },
-      "timeout-minutes" : 30,
+      "timeout-minutes" : 40,
       "env" : {
-        "HOMEBREW_NO_ANALYTICS" : "1",
-        "HOMEBREW_NO_AUTO_UPDATE" : "1",
-        "HOMEBREW_NO_INSTALL_UPGRADE" : "1",
-        "HOMEBREW_NO_INSTALL_CLEANUP" : "1",
         "CMAKE_GENERATOR" : "Ninja"
       },
       "steps" : [
@@ -96,10 +92,20 @@
             "submodules" : "recursive"
           }
         },
+        {
+          "name" : "Read additional flags",
+          "id" : "additional_flags",
+          "run" : "if test -f ./.github/workflows_flags; then\ncat ./.github/workflows_flags >> $GITHUB_OUTPUT\nfi"
+        },
+        {
+          "name" : "Set up Wine",
+          "if" : "steps.additional_flags.outputs.setup_wine == 'true'",
+          "run" : "bash /usr/local/util_scripts/setup_wine.bash"
+        },
         {
           "name" : "Set up mingw-w64 for Clang",
           "if" : "matrix.platform.compiler == 'clang'",
-          "run" : "echo \"/opt/llvm-mingw/bin\" >> $GITHUB_PATH"
+          "run" : "bash /usr/local/util_scripts/setup_llvm_mingw.bash"
         },
         {
           "name" : "Compile project",