Skip to content

Commit

Permalink
Merge pull request #9327 from Fryguy/fix_act
Browse files Browse the repository at this point in the history
Allow ui classic to run CI in act
  • Loading branch information
GilbertCherrie authored Jan 15, 2025
2 parents 9ca4323 + 9c4e0b0 commit 3d293ed
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 22 deletions.
1 change: 0 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ end
if ENV["BUNDLE_GEMFILE"].nil? || ENV["BUNDLE_GEMFILE"] == File.expand_path("../Gemfile", __FILE__)
require 'jasmine'
load 'jasmine/tasks/jasmine.rake'
require './config/jasmine_overrides'

# running jasmine outside ci ignores the `random: false` in `jasmine.yml` - needs a message
task :jasmine_url do
Expand Down
6 changes: 5 additions & 1 deletion bin/before_install
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [ -n "$CI" -a \( "$TEST_SUITE" = "spec:cypress" -o "$TEST_SUITE" = "spec:java
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
sudo apt-get update
sudo apt-get install google-chrome-beta
sudo apt-get install -y google-chrome-beta
echo
fi

Expand All @@ -21,6 +21,10 @@ if [ -n "$ACT" ]; then
curl -o- -L https://yarnpkg.com/install.sh | bash
echo "$HOME/.yarn/bin" >> $GITHUB_PATH
echo "$HOME/.config/yarn/global/node_modules/.bin" >> $GITHUB_PATH

# Install cmake so we can build rugged gem
sudo apt-get install -y cmake
echo
fi

gem_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." &>/dev/null && pwd)"
Expand Down
20 changes: 0 additions & 20 deletions config/jasmine_overrides.rb

This file was deleted.

0 comments on commit 3d293ed

Please sign in to comment.