From 788e2ae8d2380b2098cacf7158fb8038b9f3607a Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 18:13:21 +0900 Subject: Revert "Try to use env with RGV variable in the toplevel" This reverts commit 63917c1c9db60b87e14ffb3a8a162e4f58dc4276. --- .github/workflows/ubuntu-bundler3.yml | 11 ++++++++--- .github/workflows/ubuntu.yml | 9 ++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index 929d513677..42104a6948 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -8,9 +8,6 @@ on: - staging - trying -env: - RGV: ${{ matrix.rgv }} - jobs: ubuntu-bundler3: runs-on: ubuntu-latest @@ -30,10 +27,18 @@ jobs: bin/rake spec:parallel_deps - name: Run Test run: bin/parallel_rspec spec + env: + RGV: ${{ matrix.rgv }} + BUNDLER_SPEC_SUB_VERSION: 3.0.0 - name: Run Test with realworld run: bin/rake spec:realworld env: + RGV: ${{ matrix.rgv }} + BUNDLER_SPEC_SUB_VERSION: 3.0.0 BUNDLER_SPEC_PRE_RECORDED: 1 - name: Run Test with BUNDLER_SPEC_SUB_VERSION run: bin/rake spec:sudo + env: + RGV: ${{ matrix.rgv }} + BUNDLER_SPEC_SUB_VERSION: 3.0.0 timeout-minutes: 60 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index dd1e584ec9..8d63884e76 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -8,9 +8,6 @@ on: - staging - trying -env: - RGV: ${{ matrix.rgv }} - jobs: ubuntu: runs-on: ubuntu-latest @@ -48,16 +45,22 @@ jobs: - name: Prepare dependencies run: | sudo apt-get install graphviz -y + bin/rake override_version 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