From 73cd4951de20bf989747013b1e62a202f12ac2d2 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 25 Dec 2020 23:08:34 +0900
Subject: Reduced GitHub Actions

Moved leaked-globals before check.
---
 .github/workflows/macos.yml  | 4 +++-
 .github/workflows/ubuntu.yml | 8 +++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index f0355258f1..f8572eb18f 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        test_task: [ "check", "test-bundler-parallel", "test-bundled-gems", "leaked-globals" ]
+        test_task: [ "check", "test-bundler-parallel", "test-bundled-gems" ]
       fail-fast: false
     env:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
@@ -38,6 +38,8 @@ jobs:
         run: ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1.1) --with-readline-dir=$(brew --prefix readline)
       - run: make $JOBS incs
       - run: make $JOBS
+      - run: make leaked-globals
+        if: matrix.test_task == 'check'
       - run: make prepare-gems
         if: matrix.test_task == 'check'
       - run: make $JOBS -s ${{ matrix.test_task }}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index fe517d2750..4bbedc867d 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -4,7 +4,7 @@ jobs:
   make:
     strategy:
       matrix:
-        test_task: [ "check", "test-bundler-parallel", "test-bundled-gems", "test-all TESTS=--repeat-count=2", "leaked-globals" ]
+        test_task: [ "check", "test-bundler-parallel", "test-bundled-gems", "test-all TESTS=--repeat-count=2" ]
         os:
           - ubuntu-20.04
 #         - ubuntu-18.04
@@ -17,14 +17,10 @@ jobs:
             os: ubuntu-16.04
           - test_task: "test-all TESTS=--repeat-count=2"
             os: ubuntu-16.04
-          - test_task: leaked-globals
-            os: ubuntu-16.04
           - os: ubuntu-16.04
             debug: -DRUBY_DEBUG
           - test_task: "test-all TESTS=--repeat-count=2"
             debug: -DRUBY_DEBUG
-          - test_task: leaked-globals
-            debug: -DRUBY_DEBUG
       fail-fast: false
     env:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
@@ -59,6 +55,8 @@ jobs:
         run: ../src/configure -C --disable-install-doc cppflags=${{ matrix.debug }}
       - run: make $JOBS incs
       - run: make $JOBS
+      - run: make leaked-globals
+        if: matrix.test_task == 'check'
       - run: make prepare-gems
         if: matrix.test_task == 'check'
       - name: Create dummy files in build dir
-- 
cgit v1.2.3