Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bundled libyaml #541

Merged
merged 17 commits into from
Mar 23, 2022
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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' }}
2 changes: 2 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 19 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 0 additions & 19 deletions ext/psych/yaml/LICENSE

This file was deleted.

Loading