Merge branch 'master' of https://github.com/metanorma/metanorma-iho

Author: opoudjis

.github/workflows/rake.yml

@@ -4,7 +4,7 @@ name: rake
 
 on:
   push:
-    branches: [ master, main  ]
+    branches: [ master, main ]
     tags: [ v* ]
   pull_request:
 
@@ -16,17 +16,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
         include:
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'ubuntu-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'windows-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'macos-latest'
             experimental: true
     steps:
@@ -35,19 +35,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - if: matrix.os == 'macos-latest'
-        run: brew install autoconf automake libtool
-
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
-          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
-
-      - run: bundle config set path 'vendor/bundle'
-
-      - run: bundle install --jobs 4 --retry 3
+          bundler-cache: true
 
       - name: install plantuml ubuntu
         if: matrix.os == 'ubuntu-latest'
@@ -66,9 +54,6 @@ jobs:
       - if: matrix.os == 'windows-latest'
         run: cinst -y plantuml
 
-      - if: matrix.os == 'macos-latest'
-        run: brew install autoconf automake libtool
-
       - run: bundle exec rake
 
   tests-passed:

.rubocop.yml

@@ -0,0 +1,6 @@
+# This project follows the Ribose OSS style guide.
+# https://github.com/riboseinc/oss-guides
+# All project-specific additions and overrides should be specified in this file.
+
+inherit_from:
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml

spec/asciidoctor/validate_spec.rb

@@ -17,24 +17,21 @@
         mock_pdf
         Metanorma::Compile
           .new
-          .compile("spec/assets/xref_error.adoc", type: "iho", :"agree-to-terms" => true)
+          .compile("spec/assets/xref_error.adoc", type: "iho", no_install_fonts: true)
       end.to(change { File.exist?("spec/assets/xref_error.err") }
               .from(false).to(true))
     end
   end
 
   it "warns about missing workgroup" do
-  FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iho, header_footer: true)
-  #{VALIDATING_BLANK_HDR}
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iho, header_footer: true)
+      #{VALIDATING_BLANK_HDR}
 
-  == Clause 1
+      == Clause 1
 
-  Subclause
-  INPUT
-  expect(File.read("test.err")).to include "Missing workgroup attribute for document"
+      Subclause
+    INPUT
+    expect(File.read("test.err")).to include "Missing workgroup attribute for document"
   end
-
-
 end
-