Skip to content

Commit 3d293ed

Browse files
Merge pull request #9327 from Fryguy/fix_act
Allow ui classic to run CI in act
2 parents 9ca4323 + 9c4e0b0 commit 3d293ed

File tree

3 files changed

+5
-22
lines changed

3 files changed

+5
-22
lines changed

Rakefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ end
3131
if ENV["BUNDLE_GEMFILE"].nil? || ENV["BUNDLE_GEMFILE"] == File.expand_path("../Gemfile", __FILE__)
3232
require 'jasmine'
3333
load 'jasmine/tasks/jasmine.rake'
34-
require './config/jasmine_overrides'
3534

3635
# running jasmine outside ci ignores the `random: false` in `jasmine.yml` - needs a message
3736
task :jasmine_url do

bin/before_install

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if [ -n "$CI" -a \( "$TEST_SUITE" = "spec:cypress" -o "$TEST_SUITE" = "spec:java
1212
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
1313
sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
1414
sudo apt-get update
15-
sudo apt-get install google-chrome-beta
15+
sudo apt-get install -y google-chrome-beta
1616
echo
1717
fi
1818

@@ -21,6 +21,10 @@ if [ -n "$ACT" ]; then
2121
curl -o- -L https://yarnpkg.com/install.sh | bash
2222
echo "$HOME/.yarn/bin" >> $GITHUB_PATH
2323
echo "$HOME/.config/yarn/global/node_modules/.bin" >> $GITHUB_PATH
24+
25+
# Install cmake so we can build rugged gem
26+
sudo apt-get install -y cmake
27+
echo
2428
fi
2529

2630
gem_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." &>/dev/null && pwd)"

config/jasmine_overrides.rb

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)