Merge pull request #541 from ruby/remove-bundled-libyaml

Remove bundled libyaml

.github/workflows/libyaml-0.1.7.yml → .github/workflows/libyaml.yml

@@ -9,6 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [ ruby-head, "3.0", 2.7, 2.6, 2.5, 2.4 ]
+        libyaml: [0.1.7, 0.2.5]
     steps:
       - name: Install libraries
         run: sudo apt install haveged
@@ -17,11 +18,11 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Set up libyaml 0.1.7
+      - name: Set up libyaml ${{ matrix.libyaml }}
         run: |
-          wget https://pyyaml.org/download/libyaml/yaml-0.1.7.tar.gz
-          tar xzf yaml-0.1.7.tar.gz
-          cd yaml-0.1.7
+          wget https://pyyaml.org/download/libyaml/yaml-${{ matrix.libyaml }}.tar.gz
+          tar xzf yaml-${{ matrix.libyaml }}.tar.gz
+          cd yaml-${{ matrix.libyaml }}
           ./configure --prefix=/tmp/local
           make
           make install
@@ -32,5 +33,7 @@ jobs:
       - name: Run test
         run: rake
       - name: Install gem
-        run: rake install
+        run: |
+          rake build
+          gem install pkg/psych-*.gem -- --with-libyaml-dir=/tmp/local
         if: ${{ matrix.ruby != 'ruby-head' }}

.github/workflows/macos.yml

@@ -11,6 +11,8 @@ jobs:
         ruby: [ "3.0", 2.7, 2.6, 2.5, 2.4 ]
     steps:
       - uses: actions/checkout@v2
+      - name: Install libraries
+        run: brew install libyaml
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

.github/workflows/ubuntu.yml

@@ -11,7 +11,7 @@ jobs:
         ruby: [ ruby-head, "3.0", 2.7, 2.6, 2.5, 2.4 ]
     steps:
       - name: Install libraries
-        run: sudo apt install haveged
+        run: sudo apt install haveged libyaml-dev
       - uses: actions/checkout@v2
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1

.github/workflows/windows.yml

@@ -11,12 +11,30 @@ jobs:
         ruby: [ mingw, mswin, 3.0, 2.7, 2.6, 2.5, 2.4 ]
     steps:
       - uses: actions/checkout@v2
+      - name: Install libraries with vcpkg
+        id: vcpkg
+        run: |
+          vcpkg --triplet x64-windows install libyaml
+        if: ${{ matrix.ruby == 'mswin' }}
+      - name: link libraries
+        run: |
+          for %%I in (C:\vcpkg\installed\x64-windows\bin\*.dll) do (
+            mklink %%~nxI %%I
+          )
+        if: ${{ steps.vcpkg.conclusion == 'success' }}
       - name: Set up Ruby
         uses: MSP-Greg/setup-ruby-pkgs@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          mingw: _upgrade_
+          mingw: _upgrade_ libyaml
       - name: Install dependencies
         run: bundle install
+      - name: Compile
+        run: rake compile -- --with-libyaml-dir=C:/vcpkg/installed/x64-windows
+        if: ${{ matrix.ruby == 'mswin' }}
       - name: Run test
         run: rake
+
+defaults:
+  run:
+    shell: cmd