From 3beebc67c17a135bdbdfbd4afc843146a4e3f216 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Fri, 6 Mar 2020 18:22:36 +0900
Subject: Move env with RGV under the job.<job_id>

---
 .github/workflows/ubuntu-bundler3.yml | 7 ++-----
 .github/workflows/ubuntu.yml          | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml
index 353d6e81c7..f97688eda1 100644
--- a/.github/workflows/ubuntu-bundler3.yml
+++ b/.github/workflows/ubuntu-bundler3.yml
@@ -15,6 +15,8 @@ jobs:
       matrix:
         ruby: [ 2.4.9, 2.5.7, 2.6.5 ]
         rgv: [ v3.0.6, master ]
+    env:
+      RGV: ${{ matrix.rgv }}
     steps:
       - uses: actions/checkout@v1
       - name: Setup ruby
@@ -27,15 +29,10 @@ jobs:
           bin/rake spec:parallel_deps
       - name: Run Test
         run: bin/parallel_rspec spec
-        env:
-          RGV: ${{ matrix.rgv }}
       - name: Run Test with realworld
         run: bin/rake spec:realworld
         env:
-          RGV: ${{ matrix.rgv }}
           BUNDLER_SPEC_PRE_RECORDED: 1
       - name: Run Test with BUNDLER_SPEC_SUB_VERSION
         run: bin/rake spec:sudo
-        env:
-          RGV: ${{ matrix.rgv }}
     timeout-minutes: 60
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index e2b2dd24c1..b8f51095ed 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -36,6 +36,8 @@ jobs:
             rgv: v2.7.10
           - ruby: head
             rgv: v3.0.6
+    env:
+      RGV: ${{ matrix.rgv }}
     steps:
       - uses: actions/checkout@v1
       - name: Setup ruby
@@ -48,18 +50,13 @@ jobs:
           bin/rake spec:parallel_deps
       - name: Run Test
         run: bin/parallel_rspec spec
-        env:
-          RGV: ${{ matrix.rgv }}
         continue-on-error: ${{ matrix.ruby == 'head' }}
       - name: Run Test with realworld
         run: bin/rake spec:realworld
         env:
-          RGV: ${{ matrix.rgv }}
           BUNDLER_SPEC_PRE_RECORDED: 1
         continue-on-error: ${{ matrix.ruby == 'head' }}
       - name: Run Test with sudo
         run: bin/rake spec:sudo
-        env:
-          RGV: ${{ matrix.rgv }}
         continue-on-error: ${{ matrix.ruby == 'head' }}
     timeout-minutes: 60
-- 
cgit v1.2.1