Merge pull request #432 from MSP-Greg/actions-update

Update Actions
ruby · Feb 17, 2020 · bb8a35e · bb8a35e
2 parents da136f1 + fcafe24
commit bb8a35e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 39 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -5,11 +5,17 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ 2.7, 2.6, 2.5, 2.4 ]
     steps:
-    - uses: actions/checkout@master
-    - name: Install dependencies
-      run: |
-        gem install bundler --no-document
-        bundle install
-    - name: Run test
-      run: rake
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run test
+        run: rake
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -6,19 +6,18 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4', 'ruby-head']
+        ruby: [ ruby-head, 2.7, 2.6, 2.5, 2.4 ]
     steps:
-    - name: Install libraries
-      run: sudo apt install haveged
-    - uses: actions/checkout@master
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        gem install bundler --no-document
-        bundle install
-    - name: Run test
-      run: rake
+      - name: Install libraries
+        run: sudo apt install haveged
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run test
+        run: rake
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -8,20 +8,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+        ruby: [ mingw, mswin, 2.7, 2.6, 2.5, 2.4 ]
     steps:
-    - uses: actions/checkout@master
-    - name: Set up Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Update MSYS2
-      uses: MSP-Greg/msys2-action@master
-      with:
-        base: update
-    - name: Install dependencies
-      run: |
-        gem update --system --no-document --conservative
-        bundle install
-    - name: Run test
-      run: rake
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: MSP-Greg/actions-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          base: update
+      - name: Install dependencies
+        run: bundle install
+      - name: Run test
+        if: matrix.ruby != 'mswin'
+        run: rake
+      - name: Run test
+        if: matrix.ruby == 'mswin'
+        shell: cmd
+        run: |
+          call "%VCVARS%"
+          rake
diff --git a/appveyor.yml b/appveyor.yml
@@ -11,6 +11,4 @@ deploy: off
 environment:
   matrix:
     - ruby_version: "24"
-    - ruby_version: "24-x64"
     - ruby_version: "25"
-    - ruby_version: "25-x64"