Switch actions workflows to use ruby/setup-ruby

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 0042817d85877ba7e5b1942197cb87c202d33e71..5b6668a840d95a261f8d171735ebf6c377ee736d 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,21 +16,10 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby

-      uses: actions/setup-ruby@v1.1.3
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v3
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true

     - name: Run rubocop
       run: bundle exec rubocop --format fuubar
   erblint:
     - name: Run rubocop
       run: bundle exec rubocop --format fuubar
   erblint:


@@ -40,21 +29,10 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby

-      uses: actions/setup-ruby@v1.1.3
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v3
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true

     - name: Run erblint
       run: bundle exec erblint .
   eslint:
     - name: Run erblint
       run: bundle exec erblint .
   eslint:


@@ -64,16 +42,10 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby

-      uses: actions/setup-ruby@v1.1.3
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v3
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
+        bundler-cache: true

     - name: Cache node modules
       uses: actions/cache@v3
       with:
     - name: Cache node modules
       uses: actions/cache@v3
       with:


@@ -81,11 +53,6 @@ jobs:
         key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
         restore-keys: |
           yarn-${{ env.os }}-
         key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
         restore-keys: |
           yarn-${{ env.os }}-

-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3

     - name: Install node modules
       run: bundle exec rake yarn:install
     - name: Create dummy database configuration
     - name: Install node modules
       run: bundle exec rake yarn:install
     - name: Create dummy database configuration


@@ -99,20 +66,9 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby

-      uses: actions/setup-ruby@v1.1.3
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v3
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true

     - name: Run brakeman
       run: bundle exec brakeman -q
     - name: Run brakeman
       run: bundle exec brakeman -q

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1c82d20aeef4010e0b556713aa6079485d6e2ea6..c1fa68072d2a39beefd6474c93557b6d7855c43e 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,16 +20,10 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v3
     - name: Setup ruby
     - name: Checkout source
       uses: actions/checkout@v3
     - name: Setup ruby

-      uses: actions/setup-ruby@v1.1.3
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ matrix.ruby }}
       with:
         ruby-version: ${{ matrix.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v3
-      with:
-        path: vendor/bundle
-        key: bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-
+        bundler-cache: true

     - name: Cache node modules
       uses: actions/cache@v3
       with:
     - name: Cache node modules
       uses: actions/cache@v3
       with:


@@ -41,11 +35,6 @@ jobs:
       run: |
         sudo apt-get -yqq update
         sudo apt-get -yqq install memcached libvips-dev
       run: |
         sudo apt-get -yqq update
         sudo apt-get -yqq install memcached libvips-dev

-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3

     - name: Create database
       run: |
         sudo systemctl start postgresql
     - name: Create database
       run: |
         sudo systemctl start postgresql