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

Add mruby submodule to the project #197

Merged
merged 8 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
suffix: .exe
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "mruby"]
path = mruby
url = https://github.com/mruby/mruby.git
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'shellwords'
require_relative 'mrblib/rf/version'

IMAGE_NAME = 'buty4649/mruby-build:master'
IMAGE_NAME = 'buty4649/mruby-build:zig-0.12.0'

def docker_run(cmd: nil, env: nil)
env_opts = env&.map { |e| ['-e', e] }
Expand Down
1 change: 0 additions & 1 deletion build_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

def gem_config(conf)
conf.gembox 'default'
conf.gem core: 'mruby-commit-id'
conf.gem File.expand_path(__dir__)
end

Expand Down
9 changes: 7 additions & 2 deletions build_config.rb.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
mruby:
version: 3.2.0
release_no: 30200
version: 3.3.0
release_no: 30300
builds:
host:
https://github.com/fastly/mruby-optparse.git:
Expand Down Expand Up @@ -49,6 +49,11 @@ builds:
branch: master
commit: 48073012c932f540dc3773b2dc6b079caf71a70d
version: 0.0.0
https://github.com/buty4649/mruby-commit-id.git:
url: https://github.com/buty4649/mruby-commit-id.git
branch: main
commit: 2fa9d2fbd52c4cee2cb473321a7fbb451dacf103
version: 0.0.0
linux-amd64:
https://github.com/mattn/mruby-json.git:
url: https://github.com/mattn/mruby-json.git
Expand Down
1 change: 1 addition & 0 deletions mrbgem.rake
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ MRuby::Gem::Specification.new('rf') do |spec|
].each do |mgem|
spec.add_dependency mgem, mgem:
end
spec.add_dependency 'mruby-commit-id', github: 'buty4649/mruby-commit-id', branch: 'main'
spec.add_dependency 'mruby-yaml', github: 'buty4649/mruby-yaml'
spec.add_dependency 'mruby-onig-regexp', github: 'buty4649/mruby-onig-regexp'
end
1 change: 1 addition & 0 deletions mruby
Submodule mruby added at 507235