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

Drop support darwin-amd64 #166

Merged
merged 6 commits into from
Feb 17, 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
24 changes: 10 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -23,14 +23,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
os: [linux, darwin, windows]
arch: [amd64]
os-arch: [linux-amd64, darwin-arm64, windows-amd64]
include:
- os: windows
- os-arch: windows-amd64
suffix: .exe
exclude:
- os: windows
arch: arm64
steps:
- uses: actions/checkout@v4
- name: Login to Docker Hub
Expand All @@ -44,24 +40,24 @@ jobs:
ruby-version: 3.3
bundler-cache: true
- name: build
run: rake build:${{ matrix.os }}-${{ matrix.arch }}
run: rake build:${{ matrix.os-arch }}

- name: Upload test binary (${{ matrix.os }}-${{ matrix.arch }}})
- name: Upload test binary (${{ matrix.os-arch }}
uses: actions/upload-artifact@v4
with:
name: rf-${{ github.sha }}-${{ matrix.os }}-${{ matrix.arch }}
path: build/${{ matrix.os }}-${{ matrix.arch }}/bin/rf${{ matrix.suffix }}
name: rf-${{ github.sha }}-${{ matrix.os-arch }}
path: build/${{ matrix.os-arch }}/bin/rf${{ matrix.suffix }}

test:
needs: build
strategy:
matrix:
runs-on: [ubuntu-latest, macos-latest, windows-latest]
runs-on: [ubuntu-latest, macos-14, windows-latest]
include:
- runs-on: ubuntu-latest
os-arch: linux-amd64
- runs-on: macos-latest
os-arch: darwin-amd64
- runs-on: macos-14
os-arch: darwin-arm64
- runs-on: windows-latest
os-arch: windows-amd64
runs-on: ${{ matrix.runs-on }}
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ GEM
parser (>= 3.2.2.4)

PLATFORMS
arm64-darwin-22
x64-mingw-ucrt
x86_64-darwin-20
x86_64-linux

DEPENDENCIES
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ You can download rf from the [Release page](https://github.com/buty4649/rf/relea
Binary files are provided for each platform and architecture.
Please refer to the following table for each corresponding status.

| | amd64 | arm64|
|-----|-------|------|
|Linux| ||
|MacOS| ||
|Windows||- |
| | amd64 | arm64|
|-------|-------|------|
|Linux | ||
|MacOS |- ||
|Windows| |- |

You can also install it using each package manager as another method.

Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ end
def build_targets
%w[
linux-amd64 linux-arm64
darwin-amd64 darwin-arm64
darwin-arm64
windows-amd64
]
end
Expand Down
19 changes: 0 additions & 19 deletions build_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,6 @@ def build_cc_defines(conf)
end
end

if build_targets.include?('darwin-amd64')
MRuby::CrossBuild.new('darwin-amd64') do |conf|
macos_sdk = ENV.fetch('MACOSX_SDK_PATH').shellescape

build_config(conf, 'x86_64-macos', strip: true)
conf.cc.flags += ['-Wno-overriding-t-option', '-mmacosx-version-min=10.14',
'-isysroot', macos_sdk, '-iwithsysroot', '/usr/include',
'-iframeworkwithsysroot', '/System/Library/Frameworks']
conf.linker.flags += ['-Wno-overriding-t-option', '-mmacosx-version-min=10.14',
'--sysroot', macos_sdk, '-F/System/Library/Frameworks', '-L/usr/lib']
conf.archiver.command = 'zig ar'
ENV['RANLIB'] ||= 'zig ranlib'
conf.host_target = 'x86_64-darwin'

debug_config(conf)
gem_config(conf)
end
end

if build_targets.include?('darwin-arm64')
MRuby::CrossBuild.new('darwin-arm64') do |conf|
macos_sdk = ENV.fetch('MACOSX_SDK_PATH').shellescape
Expand Down