From 0a5f22cc426006da8ec2108b36abadad160f8e09 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 25 Jul 2021 14:19:12 +0900 Subject: merge revision(s) 73cd4951de20bf989747013b1e62a202f12ac2d2,6e6be107dd0c820afc4db68d09110ad96c4aebdd: 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(-) Ignore test-bundled-gems on GitHub Actions because matrix tests has unknown issues --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- .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 c1207aaf01..f9c0a17302 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" ] matrix tests has unknown issues 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 f222f25e7e..93187699be 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