From cf2ac1af085456f12fe9d970539d702cf13886eb Mon Sep 17 00:00:00 2001
From: yuangongji <yuangongji@foxmail.com>
Date: Wed, 5 Aug 2020 12:12:08 +0800
Subject: fix CI:Update cache version and replace setup-msys2

---
 .github/workflows/linux.yml | 14 +++++++-------
 .github/workflows/macos.yml |  8 ++++----
 .github/workflows/mingw.yml | 47 ++++++++++++---------------------------------
 3 files changed, 23 insertions(+), 46 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 129eb8e9..c8834623 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -43,15 +43,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2.0.0
       - name: Cache Build
-        uses: actions/cache@v1.1.0
+        uses: actions/cache@v2
         with:
           path: build
-          key: ${{ matrix.os }}-cmake-${{ matrix.EVENT_MATRIX }}-v2
+          key: ${{ matrix.os }}-cmake-${{ matrix.EVENT_MATRIX }}-v3
       - name: Cache Dist Build
-        uses: actions/cache@v1.1.0
+        uses: actions/cache@v2
         with:
           path: dist
-          key: ${{ matrix.os }}-cmake-dist-${{ matrix.EVENT_MATRIX }}-v2
+          key: ${{ matrix.os }}-cmake-dist-${{ matrix.EVENT_MATRIX }}-v3
 
       - name: Install Depends
         run: |
@@ -148,15 +148,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2.0.0
       - name: Cache Build
-        uses: actions/cache@v1.1.0
+        uses: actions/cache@v2
         with:
           path: build
           key: ${{ matrix.os }}-autotools-${{ matrix.EVENT_MATRIX }}-v2
       - name: Cache Dist Build
-        uses: actions/cache@v1.1.0
+        uses: actions/cache@v2
         with:
           path: dist
-          key: ${{ matrix.os }}-autotools-dist-${{ matrix.EVENT_MATRIX }}-v2
+          key: ${{ matrix.os }}-autotools-dist-${{ matrix.EVENT_MATRIX }}-v3
 
       - name: Install Depends
         run: |
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 84b4c9ec..ec7c9cf6 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -40,10 +40,10 @@ jobs:
       - uses: actions/checkout@v2.0.0
 
       - name: Cache Build
-        uses: actions/cache@v1.1.0
+        uses: actions/cache@v2
         with:
           path: build
-          key: macos-10.15-cmake-${{ matrix.EVENT_MATRIX }}-v2
+          key: macos-10.15-cmake-${{ matrix.EVENT_MATRIX }}-v3
 
       - name: Install Depends
         run: brew install mbedtls
@@ -121,10 +121,10 @@ jobs:
       - uses: actions/checkout@v2.0.0
 
       - name: Cache Build
-        uses: actions/cache@v1.1.0
+        uses: actions/cache@v2
         with:
           path: build
-          key: ${{ matrix.os }}-autotools-${{ matrix.EVENT_MATRIX }}-v2
+          key: ${{ matrix.os }}-autotools-${{ matrix.EVENT_MATRIX }}-v3
 
       - name: Install Depends
         run: brew install autoconf automake libtool pkg-config mbedtls
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index d0f2af85..16e673d0 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -34,29 +34,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2.0.0
-
-      - name: Cache MinGW
-        id: cache-mingw
-        uses: actions/cache@v1.1.2
-        with:
-          path: D:\a\_temp\msys
-          key: windows-mingw
-
       - name: Cache Build
-        uses: actions/cache@v1.1.2
+        uses: actions/cache@v2
         with:
           path: build
-          key: mingw-autotools-${{ matrix.EVENT_MATRIX }}-v3
-
-      - uses: numworks/setup-msys2@v1
-        if: steps.cache-mingw.outputs.cache-hit != 'true'
+          key: mingw-autotools-${{ matrix.EVENT_MATRIX }}-v4
+      - name: Setup MSYS2
+        uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
-
-      - name: Install Dependes
-        if: steps.cache-mingw.outputs.cache-hit != 'true'
-        run: |
-          msys2do pacman -S --noconfirm mingw-w64-x86_64-gcc autoconf automake libtool mingw-w64-x86_64-openssl mingw-w64-x86_64-mbedtls
+          update: true
+          install: mingw-w64-x86_64-gcc autoconf automake libtool mingw-w64-x86_64-openssl mingw-w64-x86_64-mbedtls
 
       - name: Build And Test
         shell: powershell
@@ -103,29 +91,18 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2.0.0
-
-      - name: Cache MinGW
-        id: cache-mingw-cmake
-        uses: actions/cache@v1.1.2
-        with:
-          path: D:\a\_temp\msys
-          key: windows-mingw-cmake
-
       - name: Cache Build
-        uses: actions/cache@v1.1.2
+        uses: actions/cache@v2
         with:
           path: build
-          key: mingw-cmake-${{ matrix.EVENT_MATRIX }}-v3
+          key: mingw-cmake-${{ matrix.EVENT_MATRIX }}-v4
 
-      - uses: numworks/setup-msys2@v1
-        if: steps.cache-mingw-cmake.outputs.cache-hit != 'true'
+      - name: Setup MSYS2
+        uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
-
-      - name: Install Dependes
-        if: steps.cache-mingw-cmake.outputs.cache-hit != 'true'
-        run: |
-          msys2do pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-openssl mingw-w64-x86_64-mbedtls
+          update: true
+          install: mingw-w64-x86_64-gcc mingw-w64-x86_64-openssl mingw-w64-x86_64-mbedtls  
 
       - name: Build And Test
         shell: powershell
-- 
cgit v1.2.1