From c567628e254b82641e480894dfa2b3b0011cbee4 Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Tue, 14 Nov 2023 17:17:31 +0100
Subject: [PATCH] Upd CI

---
 .github/workflows/ci.yml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2d172b26..33b7adee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,27 +35,26 @@ jobs:
             arch: x64
           - os: windows
             arch: x64
-    runs-on: ${{ ((matrix.os == 'ios' || matrix.os == 'macos') && 'macos-11')
-                 || (matrix.os == 'windows' && 'windows-2019')
-                 || 'ubuntu-latest' }}
+    runs-on: ${{ (contains('ios macos', matrix.os) && 'macos-11')
+              || (contains('windows', matrix.os)   && 'windows-2019')
+              ||                                      'ubuntu-latest' }}
     steps:
       - uses: actions/checkout@v4
 
       - run: ./disk_cleanup.sh
-        if: ${{ matrix.os == 'android' || matrix.os == 'linux' }}
+        if: ${{ contains('android linux', matrix.os) }}
       - run: powershell .\disk_cleanup.bat
-        if: ${{ matrix.os == 'windows' }}
+        if: ${{ contains('windows', matrix.os) }}
 
-      - name: Mac deps
-        run: pip install setuptools
-        if: ${{ matrix.os == 'ios' || matrix.os == 'macos' }}
+      - run: pip install setuptools
+        if: ${{ contains('ios macos', matrix.os) }}
 
       - run: make -C docker ${{ matrix.os }}${{ matrix.arch != '' && format('-{0}', matrix.arch) || '' }}
-        if: ${{ matrix.os == 'android' || matrix.os == 'linux' }}
+        if: ${{ contains('android linux', matrix.os) }}
       - run: make -C build USE_CCACHE=0 ${{ matrix.os }}${{ matrix.arch != '' && format('-{0}', matrix.arch) || '' }}
-        if: ${{ matrix.os == 'ios' || matrix.os == 'macos' }}
+        if: ${{ contains('ios macos', matrix.os) }}
       - run: powershell .\build.windows.bat
-        if: ${{ matrix.os == 'windows' }}
+        if: ${{ contains('windows', matrix.os) }}
 
       - uses: actions/upload-artifact@v3
         with: