Skip to content
This repository has been archived by the owner on Jun 30, 2024. It is now read-only.

Commit

Permalink
Merge branch 'update-dependencies'
Browse files Browse the repository at this point in the history
  • Loading branch information
luislavena committed Apr 27, 2024
2 parents d144947 + dc96717 commit 8bd5f16
Show file tree
Hide file tree
Showing 8 changed files with 178 additions and 138 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

source "https://rubygems.org"

gem "mini_portile2", "~> 2.8.1"
gem "rake", "~> 13.0.6"
gem "mini_portile2", "~> 2.8.6"
gem "rake", "~> 13.2.1"
9 changes: 5 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
GEM
remote: https://rubygems.org/
specs:
mini_portile2 (2.8.1)
rake (13.0.6)
mini_portile2 (2.8.6)
rake (13.2.1)

PLATFORMS
aarch64-linux-musl
x86_64-linux

DEPENDENCIES
mini_portile2 (~> 2.8.1)
rake (~> 13.0.6)
mini_portile2 (~> 2.8.6)
rake (~> 13.2.1)

BUNDLED WITH
2.4.9
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.PHONY: build
build: compose.yaml
@docker compose build builder

.PHONY: console
console: compose.yaml
@docker compose run --rm builder
23 changes: 14 additions & 9 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,33 @@

require "digest/sha1"
require "mini_portile2"
require "rake/clean"
require "rake/packagetask"
require "yaml"

# extend MiniPortile for local compilation
require_relative "src/custom_portile"

SUPPORTED_PLATFORMS = %w(
aarch64-linux-musl
x86_64-linux-musl
aarch64-apple-darwin20.0
x86_64-apple-darwin20.0
)

HAVERSACK_VERSION = "0.4.0"
HAVERSACK_VERSION = "0.5.0"

directory "downloads"
directory "lib"
directory "tmp"

CLEAN.concat(["lib", "tmp"])
CLOBBER.concat(["downloads", "pkg"])

# load libs.yml
libs = YAML.safe_load(File.read("libs.yml"))

# build list of platforms from `libs`
SUPPORTED_PLATFORMS = Set.new
libs.each do |lib|
lib["binaries"].each do |binary|
SUPPORTED_PLATFORMS << binary["platform"]
end
end

# define tasks for download of each platform
libs.each do |lib|
binaries = lib["binaries"]
Expand Down Expand Up @@ -51,7 +56,7 @@ libs.each do |lib|
if url = found["url"]
port.files << {
url: found["url"],
sha256: found[:sha256],
sha256: found["sha256"],
}
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ _bsd_stat_readlink() {

################## https://github.com/mkropat/sh-realpath #####################

TARGET_TRIPLET="aarch64-macos.11-none"
TARGET_PLATFORM="aarch64-apple-darwin20.0"
SDK_VERSION="${SDK_VERSION:-11}"
TARGET_TRIPLET="aarch64-macos.12-none"
TARGET_PLATFORM="aarch64-apple-darwin21.0"
SDK_VERSION="${SDK_VERSION:-12}"

SCRIPT_PATH=$(realpath "$0")
SCRIPT_DIR=$(dirname $SCRIPT_PATH)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ _bsd_stat_readlink() {

################## https://github.com/mkropat/sh-realpath #####################

TARGET_TRIPLET="x86_64-macos.11-none"
TARGET_PLATFORM="x86_64-apple-darwin20.0"
SDK_VERSION="${SDK_VERSION:-11}"
TARGET_TRIPLET="x86_64-macos.12-none"
TARGET_PLATFORM="x86_64-apple-darwin21.0"
SDK_VERSION="${SDK_VERSION:-12}"

SCRIPT_PATH=$(realpath "$0")
SCRIPT_DIR=$(dirname $SCRIPT_PATH)
Expand Down
2 changes: 1 addition & 1 deletion docker/builder.dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.4

FROM ruby:3.2.2-alpine AS base
FROM ruby:3.3.1-alpine AS base

# upgrade system and installed dependencies for security patches
RUN --mount=type=cache,sharing=private,target=/var/cache/apk \
Expand Down
259 changes: 143 additions & 116 deletions libs.yml

Large diffs are not rendered by default.

0 comments on commit 8bd5f16

Please sign in to comment.