From 9c4e0b03b32eff20f797adf505898adbbc1f8b1d Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Tue, 14 Jan 2025 16:53:18 -0500 Subject: [PATCH] Allow ui classic to run CI in act This additionally removes the jasmine overrides that we had for Travis, but are no longer necessary in GitHub Actions and act --- Rakefile | 1 - bin/before_install | 6 +++++- config/jasmine_overrides.rb | 20 -------------------- 3 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 config/jasmine_overrides.rb diff --git a/Rakefile b/Rakefile index 3f3d215e99c..172e1d876f4 100644 --- a/Rakefile +++ b/Rakefile @@ -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 diff --git a/bin/before_install b/bin/before_install index 040a83d837c..f85ac07e792 100755 --- a/bin/before_install +++ b/bin/before_install @@ -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 @@ -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)" diff --git a/config/jasmine_overrides.rb b/config/jasmine_overrides.rb deleted file mode 100644 index c09b597d232..00000000000 --- a/config/jasmine_overrides.rb +++ /dev/null @@ -1,20 +0,0 @@ -module Jasmine - class << self - alias old_server_is_listening_on server_is_listening_on - - def server_is_listening_on(_hostname, port) - # hack around Travis resolving localhost to IPv6 and failing - old_server_is_listening_on('127.0.0.1', port) - end - end - - class Configuration - alias old_initialize initialize - - def initialize - # hack around Travis resolving localhost to IPv6 and failing - @host = 'http://127.0.0.1' - old_initialize - end - end -end