Skip to content

Commit

Permalink
GH Action fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
igor-makarov committed Jul 14, 2021
1 parent 57093a4 commit d925f15
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/Lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ jobs:

name: Lint
runs-on: ${{ matrix.os }}
env:
COCOAPODS_CI_TASKS: LINT
steps:
- name: Set build image var
run: echo "ImageVersion=$ImageVersion" >> $GITHUB_ENV
Expand All @@ -37,9 +35,9 @@ jobs:
- name: Run Tests
run: bundle exec rake spec:all
env:
COCOAPODS_CI_TASKS: LINT

- name: Run Danger
run: bundle exec danger

on:
push:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/Specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [2.0.0, 2.1.9, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7]
ruby: [2.1.9, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7]
os: [ubuntu-16.04]
include:
- os: macos-10.15
Expand Down Expand Up @@ -45,6 +45,8 @@ jobs:
- name: Run Tests
run: bundle exec rake spec:all
env:
COCOAPODS_CI_TASKS: SPEC

on:
push:
Expand Down
12 changes: 8 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,15 @@ begin
namespace :spec do
desc 'Run all specs'
task :all do
puts "\n\033[0;32mUsing #{`ruby --version`.chomp}\033[0m"
title 'Running the specs'
sh "bundle exec bacon #{FileList['spec/**/*_spec.rb'].join(' ')}"
if ENV['COCOAPODS_CI_TASKS'].nil? || ENV['COCOAPODS_CI_TASKS'].include?('SPEC')
puts "\n\033[0;32mUsing #{`ruby --version`.chomp}\033[0m"
title 'Running the specs'
sh "bundle exec bacon #{FileList['spec/**/*_spec.rb'].join(' ')}"
end

Rake::Task['rubocop'].invoke
if ENV['COCOAPODS_CI_TASKS'].nil? || ENV['COCOAPODS_CI_TASKS'].include?('LINT')
Rake::Task['rubocop'].invoke
end
end

desc 'Automatically run specs'
Expand Down

0 comments on commit d925f15

Please sign in to comment.