diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-03-06 07:49:05 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-03-06 07:49:05 +0900 |
| commit | 75e869f047fc924bdc5d95a2750ad1d40ea2cc23 (patch) | |
| tree | 4c72128cd4e774dec6fa69a5646b4774f65dddcb | |
| parent | 4d1096614a87c66565ed55e35ba8037b9b2eaf84 (diff) | |
| download | bundler-75e869f047fc924bdc5d95a2750ad1d40ea2cc23.tar.gz | |
Merge spec:sudo to ubuntu and ubuntu-bundler3 jobs
| -rw-r--r-- | .github/workflows/ubuntu-bundler3.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/ubuntu-sudo.yml | 37 | ||||
| -rw-r--r-- | .github/workflows/ubuntu.yml | 5 |
3 files changed, 11 insertions, 37 deletions
diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index 448c237478..b14b6f45fb 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -35,5 +35,11 @@ jobs: 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-sudo.yml b/.github/workflows/ubuntu-sudo.yml deleted file mode 100644 index 27dd8e871b..0000000000 --- a/.github/workflows/ubuntu-sudo.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: ubuntu-sudo - -on: - pull_request: - - push: - branches: - - staging - - trying - -jobs: - ubuntu-sudo: - runs-on: ubuntu-latest - strategy: - matrix: - ruby: [ 2.4.x, 2.5.x, 2.6.x ] - rgv: [ v3.0.6, master ] - steps: - - uses: actions/checkout@v1 - - name: Setup ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - - name: Prepare dependencies - run: | - bin/rake override_version - bin/rake spec:deps - - name: Run Test - run: sudo -E bin/rake spec:sudo - env: - RGV: ${{ matrix.rgv }} - - name: Run Test with BUNDLER_SPEC_SUB_VERSION - run: sudo -E 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 2c874c74f5..def3869e53 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -59,4 +59,9 @@ jobs: 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 |