Skip to content

Commit

Permalink
[ci] updated actions used in github actions scripts with fix for cove…
Browse files Browse the repository at this point in the history
…ralls errors (#268)

* [ci] updated actions used in github actions scripts

* [ci] updated all the actions

* [ci] updated ci action

* removed duplicated coveralls

* replace coveralls with coveralls_reborn

---------

Co-authored-by: jfederico <[email protected]>
  • Loading branch information
Mariam05 and jfederico authored Feb 9, 2024
1 parent 3b76965 commit d8d7e69
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 39 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.build.prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ jobs:
DOCKER_REPOSITORY: ${{ secrets.DOCKER_REPOSITORY }}
DOCKER_BUILD_ENABLED: ${{ secrets.DOCKER_BUILD_ENABLED }}
DOCKER_BUILD_ALTERNATE_ENABLED: ${{ secrets.DOCKER_BUILD_ALTERNATE_ENABLED }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Docker Buildx
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Login to DockerHub
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.build.push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ jobs:
DOCKER_REPOSITORY: ${{ secrets.DOCKER_REPOSITORY }}
DOCKER_BUILD_ENABLED: ${{ secrets.DOCKER_BUILD_ENABLED }}
DOCKER_BUILD_ALTERNATE_ENABLED: ${{ secrets.DOCKER_BUILD_ALTERNATE_ENABLED }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Docker Buildx
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
Expand All @@ -35,7 +35,7 @@ jobs:
- name: Login to DockerHub
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -60,7 +60,7 @@ jobs:

- name: Build and Push branch
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
push: true
tags: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.build.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ jobs:
DOCKER_REPOSITORY: ${{ secrets.DOCKER_REPOSITORY }}
DOCKER_BUILD_ENABLED: ${{ secrets.DOCKER_BUILD_ENABLED }}
DOCKER_BUILD_ALTERNATE_ENABLED: ${{ secrets.DOCKER_BUILD_ALTERNATE_ENABLED }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Docker Buildx
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Login to DockerHub
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
name: CI
on:
push:
branches-ignore: master
branches-ignore:
- 'master'
- 'release**'
pull_request:
branches: "*"
env:
RUBY_VERSION: 3.0.x
RUBY_VERSION: '3.1.4'
DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres

jobs:
test:
name: Rubocop + RSpec
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
postgres:
Expand All @@ -30,15 +32,15 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Ruby ${{ env.RUBY_VERSION }}
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}

- name: Bundle cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ gem 'omniauth-bbbltibroker', git: 'https://github.com/bigbluebutton/omniauth-bbb

gem 'activerecord-session_store', '>= 2.1.0'

gem 'coveralls', require: false
gem 'coveralls_reborn', require: false
gem 'net-smtp'
gem 'webpacker', '~> 6.0.0.rc.5'

Expand Down
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,11 @@ GEM
cgi (0.4.0)
childprocess (4.1.0)
concurrent-ruby (1.2.2)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
term-ansicolor (~> 1.3)
thor (>= 0.19.4, < 2.0)
tins (~> 1.6)
coveralls_reborn (0.28.0)
simplecov (~> 0.22.0)
term-ansicolor (~> 1.7)
thor (~> 1.2)
tins (~> 1.32)
crack (0.4.5)
rexml
crass (1.0.6)
Expand Down Expand Up @@ -344,11 +343,12 @@ GEM
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semantic_range (3.0.0)
simplecov (0.16.1)
simplecov (0.22.0)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
snaky_hash (2.0.1)
hashie
version_gem (~> 1.1, >= 1.1.1)
Expand Down Expand Up @@ -422,7 +422,7 @@ DEPENDENCIES
bigbluebutton-api-ruby (~> 1.9.1)
byebug
capybara
coveralls
coveralls_reborn
database_cleaner-active_record
dotenv-rails
factory_bot_rails (>= 6.4.3)
Expand Down
4 changes: 0 additions & 4 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# frozen_string_literal: true

require 'coveralls'

Coveralls.wear!

# This file is copied to spec/ when you run 'rails generate rspec:install'
require 'spec_helper'

Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require 'coveralls'

Coveralls.wear!
Coveralls.wear!('rails')

require 'webmock/rspec'
require 'omniauth'
Expand Down

0 comments on commit d8d7e69

Please sign in to comment.