Fix cmake command-line parameters (#29)

metanorma · Apr 13, 2022 · c79cef5 · c79cef5
1 parent b18c6b4
commit c79cef5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,6 +38,7 @@ jobs:
     - run: bundle exec rake
 
   build:
+    name: build ${{ matrix.os }}, ${{ matrix.ruby-version }}, ${{ matrix.platform }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -46,18 +47,23 @@ jobs:
           - os: ubuntu-18.04
             platform: any
             ruby-version: '2.7'
+            file: 'skip'
           - os: ubuntu-18.04
             platform: x86_64-linux
             ruby-version: '2.7'
+            file: 'ELF 64-bit LSB shared object, x86-64'
           - os: windows-latest
             platform: x64-mingw32
             ruby-version: '2.7'
+            file: 'skip'
           - os: windows-latest
             platform: x64-mingw-ucrt
             ruby-version: '3.1'
+            file: 'skip'
           - os: macos-latest
             platform: x86_64-darwin
             ruby-version: '2.7'
+            file: 'Mach-O 64-bit dynamically linked shared library x86_64'
     steps:
     - uses: actions/checkout@v3
 
@@ -86,6 +92,10 @@ jobs:
       run: |
         ruby -remf2svg -e "puts File.write('output.svg', Emf2svg.from_file('spec/examples/image1.emf'), mode: 'wb')"
 
+    - name: Check file format
+      if: matrix.file != 'skip'
+      run: file $(ls pkg/*/lib/emf2svg/libemf2svg.*) | grep "${{ matrix.file }}"
+
   test-build:
     needs: build
     runs-on: ${{ matrix.os }}
@@ -149,16 +159,20 @@ jobs:
         ruby -remf2svg -e "puts File.write('output.svg', Emf2svg.from_file('spec/examples/image1.emf'), mode: 'wb')"
 
   cross:
+    name: build ${{ matrix.os }}, ${{ matrix.ruby-version }}, ${{ matrix.platform }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
             platform: aarch64-linux
             ruby-version: '2.7'
+            file: 'ELF 64-bit LSB shared object, ARM aarch64'
           - os: macos-latest
             platform: arm64-darwin
             ruby-version: '2.7'
+            file: 'Mach-O 64-bit dynamically linked shared library arm64'
     steps:
     - uses: actions/checkout@v3
 
@@ -182,3 +196,6 @@ jobs:
 
     - name: Install gem
       run: gem install -b pkg/emf2svg-*.gem
+
+    - name: Check file format
+      run: file $(ls pkg/*/lib/emf2svg/libemf2svg.*) | grep "${{ matrix.file }}"
diff --git a/lib/emf2svg/recipe.rb b/lib/emf2svg/recipe.rb
@@ -99,7 +99,7 @@ def configure_defaults
       opts << "-DLONLY=ON"
 
       unless target_triplet.nil? || drop_target_triplet?
-        opts << " -DVCPKG_TARGET_TRIPLET=#{target_triplet}"
+        opts << "-DVCPKG_TARGET_TRIPLET=#{target_triplet}"
       end
 
       opts << "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"

diff --git a/lib/emf2svg/version.rb b/lib/emf2svg/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Emf2svg
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end