Skip to content

[lets-rust] Get CI for Linux/macOS working #187

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.

Sign up for GitHub

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

Closed
kivikakk wants to merge 18 commits into from
Closed

[lets-rust] Get CI for Linux/macOS working #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
852be2c
run a `find` to explore GEM_ROOT_DIR on Actions
kivikakk Aug 5, 2022
ad7466c
run build
kivikakk Aug 5, 2022
2a4bcf6
what about . ?
kivikakk Aug 5, 2022
1c19bd9
already chdir'd into the tmp/arch-os/commonmarker/3.1.2/...
kivikakk Aug 5, 2022
9565657
now where we at
kivikakk Aug 5, 2022
a51a7aa
try only staticlib
kivikakk Aug 5, 2022
530cb3b
cleanup
kivikakk Aug 5, 2022
246b5c0
use gnu toolchain for cargo to match ruby etc
kivikakk Aug 5, 2022
c1dc976
try this way
kivikakk Aug 5, 2022
aca841e
just try for funsies
kivikakk Aug 5, 2022
e3b4c25
hokay
kivikakk Aug 5, 2022
9ce8208
just the triple
kivikakk Aug 5, 2022
6567783
now don't depend on the crate-type
kivikakk Aug 5, 2022
a6a3229
sshhhhh
kivikakk Aug 5, 2022
40098a4
pls
kivikakk Aug 5, 2022
574dc51
ok
kivikakk Aug 5, 2022
c99f98d
what in tarnation???
kivikakk Aug 5, 2022
5e48d8f
nvm
kivikakk Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ jobs:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true # 'bundle install' and cache

- name: Set Cargo triple
if: runner.os == 'Windows'
shell: bash
run: rustup default stable-x86_64-pc-windows-gnu

- name: Run ${{ matrix.os }} tests
shell: bash
run: script/cibuild
17 changes: 3 additions & 14 deletions ext/commonmarker/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
RbConfig::CONFIG["CC"] = RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
ENV["CC"] = RbConfig::CONFIG["CC"]

def darwin?
RbConfig::CONFIG["target_os"].include?("darwin")
end

# what follows is pretty much an abuse of miniportile2, but it works for now
# i just need something to download files and run a cargo build; one day this should
# be replaced with actual prepacked binaries.
Expand Down Expand Up @@ -51,17 +47,9 @@ def darwin?
recipe.download unless recipe.downloaded?
recipe.extract

tarball_extract_path = if darwin?
recipe.host =~ /arm64-apple-darwin(\d+)\.\d+\.0/
host = "arm64-darwin#{$1}"
File.join(GEM_ROOT_DIR, "tmp", host, "commonmarker", RUBY_VERSION, "tmp", recipe.host, "ports", recipe.name, recipe.version, "#{recipe.name}-#{recipe.version}")
else
File.join(GEM_ROOT_DIR, "tmp", recipe.host, "ports", recipe.name, recipe.version, "#{recipe.name}-#{recipe.version}")
end

# Why is this so long?
tarball_extract_path = File.join("tmp", recipe.host, "ports", recipe.name, recipe.version, "#{recipe.name}-#{recipe.version}")
Dir.chdir(tarball_extract_path) do
puts `cargo build --manifest-path=./c-api/Cargo.toml --release`
system "cargo build --manifest-path=./c-api/Cargo.toml --release"
end
lib_header_path = File.join(tarball_extract_path, "c-api", "include")
lib_build_path = File.join(tarball_extract_path, "c-api", "target", "release")
Expand All @@ -75,6 +63,7 @@ def darwin?
recipe.activate

$LIBS << ' -lcomrak_ffi'
$LIBS << ' -lbcrypt' if windows
end

unless find_header("comrak_ffi.h")
Expand Down