Use custom mono install action

filmor · filmor · commit 8e68a7ce930f · 2026-03-03T00:56:45.000+01:00
diff --git a/.github/actions/install-mono/action.yml b/.github/actions/install-mono/action.yml
@@ -10,42 +10,45 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Cache on Linux
-      if: runner.os == 'Linux'
-      uses: actions/cache@v5
-      with:
-        path: .apt
-        key: mono-${{ runner.os }}-${{ inputs.arch }}
+    # Windows Cache
+    - name: Cache setup on Windows
+      if: runner.os == 'Windows'
+      run: |
+        mkdir -p .choco-cache
+        choco config set cacheLocation $(pwd)/.choco-cache
+      shell: bash
 
     - name: Cache on Windows
       if: runner.os == 'Windows'
       uses: actions/cache@v5
       with:
-        path: ${{ env.TEMP }}\chocolatey
+        path: .choco-cache
         key: mono-${{ runner.os }}-${{ inputs.arch }}
 
-    # - name: Cache on macOS (x86_64)
-    #   if: runner.os == 'Linux'
-    #   uses: actions/cache@v5
-    #   with:
-    #     path: .apt
-    #     key: mono-${{ runner.os }}-${{ inputs.arch }}
-    #
-    # - name: Cache on macOS (arm64)
-    #   if: runner.os == 'Linux'
-    #   uses: actions/cache@v5
-    #   with:
-    #     path: .apt
-    #     key: mono-${{ runner.os }}-${{ inputs.arch }}
+    # macOS Cache
+    - name: Set Homebrew Cache Path
+      if: runner.os == 'macOS'
+      run: |
+        mkdir -p .brew-cache
+        echo "HOMEBREW_CACHE=$(pwd)/.brew-cache" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Cache Homebrew on macOS
+      if: runner.os == 'macOS'
+      uses: actions/cache@v5
+      with:
+        path: .brew-cache
+        key: mono-brew-${{ runner.os }}-${{ inputs.arch }}
 
     # ===================================
 
     - name: Install on Linux
       if: runner.os == 'Linux'
-      run: |
-        sudo apt-get -o Dir::Cache=".apt" update
-        sudo apt-get -o Dir::Cache=".apt" install -y mono-runtime-sgen
-      shell: sh
+      uses: awalsh128/cache-apt-pkgs-action@v1
+      with:
+        packages: mono-runtime-sgen
+
+    # ===================================
 
     - name: Install on Windows (x86)
       if: runner.os == 'Windows' && inputs.arch == 'x86'
@@ -57,17 +60,19 @@ runs:
       run: choco install -y mono
       shell: sh
 
+    # ===================================
+    #
     - name: Install on macOS (x86_64)
       if: runner.os == 'macOS' && inputs.arch == 'x64'
       run: |
         arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-        arch -x86_64 /usr/local/bin/brew install mono
+        arch -x86_64 /usr/local/bin/brew install --ignore-dependencies mono
       shell: sh
 
     - name: Install on macOS (arm64)
       if: runner.os == 'macOS' && inputs.arch != 'x64'
       run: |
         brew update
-        brew install mono
+        brew install --ignore-dependencies mono
       shell: sh
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -56,18 +56,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6
 
+      # Use main until support for architecture lands
       - name: Setup .NET
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@main
         with:
-          dotnet-version: '10.0.x'
-
-      - name: Setup upterm session
-        uses: owenthereal/action-upterm@v1
-        if: ${{ matrix.os.category == 'macos' }}
-        with:
-          ## Shut down the server if unconnected after 5 minutes.
-          limit-access-to-actor: true
-          wait-timeout-minutes: 15
+          dotnet-version: '10.0'
+          architecture: ${{ matrix.os.platform }}
 
       - name: Install Mono
         uses: ./.github/actions/install-mono
