From d61145d75f183bb6f75111f9375cee5df8ed0d34 Mon Sep 17 00:00:00 2001
From: freef4ll <103502659+freef4ll@users.noreply.github.com>
Date: Mon, 14 Oct 2024 09:52:59 +0300
Subject: [PATCH] ci: Update swift-code-coverage.yml and drop swift 5.8 build
 (#280)

---
 .github/workflows/swift-code-coverage.yml  | 11 +++++++----
 .github/workflows/swift-linux-previous.yml |  7 +++++--
 .github/workflows/swift-macos-previous.yml |  6 +++---
 codecov.yml                                |  2 --
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/swift-code-coverage.yml b/.github/workflows/swift-code-coverage.yml
index 67d56a44..277ba6ae 100644
--- a/.github/workflows/swift-code-coverage.yml
+++ b/.github/workflows/swift-code-coverage.yml
@@ -12,11 +12,13 @@ jobs:
     timeout-minutes: 60
     steps:
     - uses: actions/checkout@v4
-
+    - uses: khlopko/setup-swift@bfd61cbd14eeef55a27afc45138b61ced7174839
+    - name: Swift version
+      run: swift --version
     - name: Ubuntu deps
       if: ${{ runner.os == 'Linux' }}
       run: |
-        sudo apt-get install -y libjemalloc-dev llvm-15
+        sudo apt-get install -y libjemalloc-dev #llvm-15
 
     - name: Start consul
       uses: ./.github/actions/consul-start
@@ -35,12 +37,13 @@ jobs:
          fi
 
          if [ -f ${xctest_binary} ]; then
-             llvm-cov-15 export -format="lcov" ${xctest_binary} -instr-profile .build/debug/codecov/default.profdata > info.lcov
+             llvm-cov export -format="lcov" ${xctest_binary} -instr-profile .build/debug/codecov/default.profdata > info.lcov
          fi
 
     - name: Upload codecov
       uses: codecov/codecov-action@v4
       with: 
-        token: ${{ secrets.CODECOV_REPO_TOKEN }} 
+        token: ${{ secrets.CODECOV_REPO_TOKEN }}
         files: info.lcov
         fail_ci_if_error: true
+        verbose: true
diff --git a/.github/workflows/swift-linux-previous.yml b/.github/workflows/swift-linux-previous.yml
index e66104ec..e3e41cb7 100644
--- a/.github/workflows/swift-linux-previous.yml
+++ b/.github/workflows/swift-linux-previous.yml
@@ -14,16 +14,19 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        swift: ["5.8", "5.9"]
+        swift: ["5.9", "5.10"]
 
 
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: fwal/setup-swift@v1
+    - uses: swift-actions/setup-swift@v2
       with:
         swift-version: ${{ matrix.swift }}
 
+    - name: Swift version
+      run: swift --version
+
     - uses: actions/checkout@v3    
 
     - name: Start consul
diff --git a/.github/workflows/swift-macos-previous.yml b/.github/workflows/swift-macos-previous.yml
index e52f0780..bb120180 100644
--- a/.github/workflows/swift-macos-previous.yml
+++ b/.github/workflows/swift-macos-previous.yml
@@ -13,13 +13,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13]
-        swift: ["5.8", "5.9"]
+        os: [macos-14]
+        swift: ["5.9", "5.10"]
 
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: fwal/setup-swift@v1
+    - uses: swift-actions/setup-swift@v2
       with:
         swift-version: ${{ matrix.swift }}
 
diff --git a/codecov.yml b/codecov.yml
index 07242a2b..b3bf5966 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,4 +1,2 @@
 ignore:
   - "Benchmarks"  # ignore Benchmarks
-s
-