Refactor CI

uyjulian · Jul 25, 2023 · ca8d721 · ca8d721
1 parent 32260cc
commit ca8d721
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,16 @@
   },
   "jobs" : {
     "build-win32" : {
-      "runs-on" : "ubuntu-20.04",
+      "runs-on" : "ubuntu-latest",
+      "container" : {
+        "image" : "ghcr.io/uyjulian/tvp_win32_build_container:latest",
+        "options" : "--user 1001:123"
+      },
+      "defaults" : {
+        "run" : {
+          "shell" : "bash"
+        }
+      },
       "strategy" : {
         "matrix" : {
           "platform" : [
@@ -82,28 +91,15 @@
       "steps" : [
         {
           "name" : "Checkout repository",
-          "uses" : "actions/checkout@v2",
+          "uses" : "actions/checkout@v3",
           "with" : {
             "submodules" : "recursive"
           }
         },
-        {
-          "name" : "Set up Homebrew environment for Github Actions",
-          "run" : "echo \"/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin\" >> $GITHUB_PATH"
-        },
-        {
-          "name" : "Set up default build tools",
-          "run" : "brew install make nasm cmake ninja"
-        },
-        {
-          "name" : "Set up mingw-w64 for GCC",
-          "if" : "matrix.platform.compiler == 'gcc'",
-          "run" : "brew install mingw-w64"
-        },
         {
           "name" : "Set up mingw-w64 for Clang",
           "if" : "matrix.platform.compiler == 'clang'",
-          "run" : "curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-mingw-20220906-msvcrt-ubuntu-18.04-x86_64.tar.xz\ntar xvf llvm-mingw-20220906-msvcrt-ubuntu-18.04-x86_64.tar.xz\nmv llvm-mingw-20220906-msvcrt-ubuntu-18.04-x86_64 /opt/llvm-mingw\nexport PATH=\"/opt/llvm-mingw/bin:$PATH\"\necho \"/opt/llvm-mingw/bin\" >> $GITHUB_PATH"
+          "run" : "echo \"/opt/llvm-mingw/bin\" >> $GITHUB_PATH"
         },
         {
           "name" : "Compile project",
@@ -123,7 +119,7 @@
       "needs" : [
         "build-win32"
       ],
-      "runs-on" : "ubuntu-20.04",
+      "runs-on" : "ubuntu-latest",
       "timeout-minutes" : 5,
       "if" : "startsWith(github.ref, 'refs/tags/v')",
       "steps" : [