From 933f44568f3a878979654d9af0192c8a699f4a1e Mon Sep 17 00:00:00 2001 From: Charlie Jonas Date: Fri, 2 Oct 2020 09:55:50 +0100 Subject: [PATCH 1/2] Update ruby version and remove extraneous config --- .github/workflows/pull_request.yml | 2 -- .ruby-version | 2 +- .rvmrc | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 .rvmrc diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index ed2b1368..bc81120c 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -10,8 +10,6 @@ jobs: steps: - run: docker run -d -p 6379:6379 redis - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.6 - uses: actions/checkout@v2.1.1 - name: Install dep gem run: gem install dep diff --git a/.ruby-version b/.ruby-version index 2bf1c1cc..338a5b5d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.1 +2.6.6 diff --git a/.rvmrc b/.rvmrc deleted file mode 100644 index ab63b7ba..00000000 --- a/.rvmrc +++ /dev/null @@ -1 +0,0 @@ -rvm ruby-1.9.2@redis-io From 1d4f6806a6349dc3f4ec4edf0156f3db0c3d3291 Mon Sep 17 00:00:00 2001 From: Charlie Jonas Date: Fri, 2 Oct 2020 10:05:06 +0100 Subject: [PATCH 2/2] Clone repo before setting up Ruby CI environment We need the .ruby-version file to be present before we setup the Ruby environment so we need to checkout the repo first. Signed-off-by: Charlie Jonas --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index bc81120c..802e26d4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -9,8 +9,8 @@ jobs: runs-on: ubuntu-latest steps: - run: docker run -d -p 6379:6379 redis - - uses: ruby/setup-ruby@v1 - uses: actions/checkout@v2.1.1 + - uses: ruby/setup-ruby@v1 - name: Install dep gem run: gem install dep - name: Install dependencies