Remove HAML dependency

RTrampov · Oct 11, 2023 · 19eca3d · 19eca3d
1 parent 56ff8ab
commit 19eca3d
Show file tree

Hide file tree

Showing 28 changed files with 392 additions and 774 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,7 @@
 ---
 name: Tests
-'on':
+on:
+  workflow_dispatch:
   push:
     branches:
     - master
@@ -14,34 +15,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - ruby: 2.5.9
-          gemfile: Gemfile.rails-3.2
-        - ruby: 2.5.9
-          gemfile: Gemfile.rails-4.2.haml-4
-        - ruby: 2.5.9
-          gemfile: Gemfile.rails-4.2.haml-5
-        - ruby: 2.5.9
-          gemfile: Gemfile.rails-5.1.haml-4
-        - ruby: 2.5.9
-          gemfile: Gemfile.rails-5.1.haml-5
-
+        - ruby: 2.6.6
+          gemfile: Gemfile.rails-4.2
         - ruby: 2.7.2
-          gemfile: Gemfile.rails-5.1.haml-4
+          gemfile: Gemfile.rails-5.2
         - ruby: 2.7.2
-          gemfile: Gemfile.rails-5.1.haml-5
-        - ruby: 2.7.2
-          gemfile: Gemfile.rails-6.1.haml-5
-        - ruby: 2.7.2
-          gemfile: Gemfile.rails-7.0.haml-5
-
-        - ruby: 3.0.1
-          gemfile: Gemfile.rails-5.1.haml-4
-        - ruby: 3.0.1
-          gemfile: Gemfile.rails-5.1.haml-5
-        - ruby: 3.0.1
-          gemfile: Gemfile.rails-6.1.haml-5
-        - ruby: 3.0.1
-          gemfile: Gemfile.rails-7.0.haml-5
+          gemfile: Gemfile.rails-6.1
+        - ruby: 3.0.6
+          gemfile: Gemfile.rails-5.2
+        - ruby: 3.0.6
+          gemfile: Gemfile.rails-6.1
+#        - ruby: 3.0.6
+#          gemfile: Gemfile.rails-7.0
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:

diff --git a/Gemfile b/Gemfile
@@ -1 +1 @@
-Gemfile.rails-5.1.haml-5
+Gemfile.rails-6.1
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1 +1 @@
-Gemfile.rails-5.1.haml-5.lock
+Gemfile.rails-6.1.lock
diff --git a/Gemfile.rails-3.2 b/Gemfile.rails-3.2
diff --git a/Gemfile.rails-3.2.lock b/Gemfile.rails-3.2.lock
diff --git a/Gemfile.rails-4.2.haml-4 → Gemfile.rails-4.2 b/Gemfile.rails-4.2.haml-4 → Gemfile.rails-4.2
@@ -1,8 +1,9 @@
+ruby '~> 2.6'
+
 source 'http://rubygems.org'
 
-gem 'actionpack', '~>4.2'
+gem 'actionpack', '~> 4.2'
 gem 'rspec'
-gem 'haml', '<5'
 gem 'angular_xss', :path => '.'
 gem 'gemika'
 gem 'rake'
diff --git a/Gemfile.rails-4.2.haml-4.lock b/Gemfile.rails-4.2.haml-4.lock
diff --git a/Gemfile.rails-4.2.haml-5.lock b/Gemfile.rails-4.2.haml-5.lock