Skip to content

Commit

Permalink
Merge pull request #33 from IAPark/fix-cross-compile
Browse files Browse the repository at this point in the history
Fix cross compilation
  • Loading branch information
IAPark authored Apr 4, 2024
2 parents b34eff0 + e1c2e79 commit f7f95ca
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
16 changes: 7 additions & 9 deletions .github/workflows/cross_compile.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
---
name: CI

on:
workflow_dispatch:
push:
tags:
- "v*"
name: cross-compile
on: [push]

jobs:
ci-data:
Expand All @@ -16,7 +11,8 @@ jobs:
- uses: oxidize-rb/actions/fetch-ci-data@v1
id: fetch
with:
supported-ruby-platforms: true
supported-ruby-platforms: |
exclude: ['aarch64-linux-musl', 'x64-mingw32']
stable-ruby-versions: |
exclude: [head]
cross-gem:
Expand All @@ -32,7 +28,9 @@ jobs:
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.1"

- name: 'bundle install'
shell: bash
run: 'bundle install'
- uses: oxidize-rb/actions/cross-gem@v1
id: cross-gem
with:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
tiktoken_ruby (0.0.8)
rb_sys (>= 0.9.86)
rb_sys (= 0.9.87)

GEM
remote: https://rubygems.org/
Expand All @@ -22,7 +22,7 @@ GEM
rake (13.1.0)
rake-compiler (1.2.5)
rake
rb_sys (0.9.86)
rb_sys (0.9.87)
regexp_parser (2.9.0)
rexml (3.2.6)
rspec (3.12.0)
Expand Down Expand Up @@ -89,4 +89,4 @@ DEPENDENCIES
yard-doctest

BUNDLED WITH
2.4.6
2.4.4
2 changes: 1 addition & 1 deletion ext/tiktoken_ruby/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ crate-type = ["cdylib"]

[dependencies]
magnus = { version = "0.6.1" }
rb-sys = { version = "*", features = ["stable-api-compiled-fallback"] }
rb-sys = { version = "0.9.87", features = ["stable-api-compiled-fallback"] }
tiktoken-rs = { git = "https://github.com/IAPark/tiktoken-rs.git" }
2 changes: 1 addition & 1 deletion tiktoken_ruby.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]
spec.extensions = ["ext/tiktoken_ruby/extconf.rb"]
spec.add_dependency "rb_sys", ">= 0.9.86"
spec.add_dependency "rb_sys", "= 0.9.87"
end

0 comments on commit f7f95ca

Please sign in to comment.