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.

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

Jump to bottom

Revert "Build Ruby 3.0 for old distributions" #28

Merged
merged 1 commit into from
Feb 16, 2024
Merged

Revert "Build Ruby 3.0 for old distributions" #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 25 additions & 37 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,34 @@ jobs:
strategy:
fail-fast: false
matrix:
# Ruby 3.4 requires BASERUBY 3.0
entry:
- { os: 'lunar', system_ruby: '3.1', tag: 'gcc-13', extras: 'g++-13' }
- { os: 'jammy', system_ruby: '3.0', tag: 'gcc-12', extras: 'g++-12' }
- { os: 'focal', build_ruby: '3.0', tag: 'gcc-11', extras: 'g++-11' }
- { os: 'focal', build_ruby: '3.0', tag: 'gcc-10', extras: 'g++-10' }
- { os: 'focal', build_ruby: '3.0', tag: 'gcc-9', extras: 'g++-9' }
- { os: 'focal', build_ruby: '3.0', tag: 'gcc-8', extras: 'g++-8' }
- { os: 'focal', build_ruby: '3.0', tag: 'gcc-7', extras: 'g++-7' }
- { os: 'lunar', baseruby: '3.1', tag: 'gcc-13', extras: 'g++-13' }
- { os: 'jammy', baseruby: '3.0', tag: 'gcc-12', extras: 'g++-12' }
- { os: 'focal', baseruby: '2.7', tag: 'gcc-11', extras: 'g++-11' }
- { os: 'focal', baseruby: '2.7', tag: 'gcc-10', extras: 'g++-10' }
- { os: 'focal', baseruby: '2.7', tag: 'gcc-9', extras: 'g++-9' }
- { os: 'focal', baseruby: '2.7', tag: 'gcc-8', extras: 'g++-8' }
- { os: 'focal', baseruby: '2.7', tag: 'gcc-7', extras: 'g++-7' }

# The clang-14, 13 arm64 are not available.
- { os: 'jammy', system_ruby: '3.0', tag: 'clang-18', extras: 'llvm-18', platforms: 'linux/amd64' }
- { os: 'jammy', system_ruby: '3.0', tag: 'clang-17', extras: 'llvm-17', platforms: 'linux/amd64' }
- { os: 'jammy', system_ruby: '3.0', tag: 'clang-16', extras: 'llvm-16', platforms: 'linux/amd64' }
- { os: 'focal', build_ruby: '3.0', tag: 'clang-15', extras: 'llvm-15', platforms: 'linux/amd64' }
- { os: 'focal', build_ruby: '3.0', tag: 'clang-14', extras: 'llvm-14', platforms: 'linux/amd64' }
- { os: 'focal', build_ruby: '3.0', tag: 'clang-13', extras: 'llvm-13', platforms: 'linux/amd64' }
- { os: 'focal', build_ruby: '3.0', tag: 'clang-12', extras: 'llvm-12' }
- { os: 'focal', build_ruby: '3.0', tag: 'clang-11', extras: 'llvm-11' }
- { os: 'focal', build_ruby: '3.0', tag: 'clang-10', extras: 'llvm-10' }
- { os: 'focal', build_ruby: '3.0', tag: 'clang-9', extras: 'llvm-9' }
- { os: 'focal', build_ruby: '3.0', tag: 'clang-8', extras: 'llvm-8' }
- { os: 'focal', build_ruby: '3.0', tag: 'clang-7', extras: 'llvm-7' }
- { os: 'focal', build_ruby: '3.0', tag: 'clang-6.0', extras: 'llvm-6.0' }
- { os: 'jammy', baseruby: '3.0', tag: 'clang-18', extras: 'llvm-18', platforms: 'linux/amd64' }
- { os: 'jammy', baseruby: '3.0', tag: 'clang-17', extras: 'llvm-17', platforms: 'linux/amd64' }
- { os: 'jammy', baseruby: '3.0', tag: 'clang-16', extras: 'llvm-16', platforms: 'linux/amd64' }
- { os: 'focal', baseruby: '2.7', tag: 'clang-15', extras: 'llvm-15', platforms: 'linux/amd64' }
- { os: 'focal', baseruby: '2.7', tag: 'clang-14', extras: 'llvm-14', platforms: 'linux/amd64' }
- { os: 'focal', baseruby: '2.7', tag: 'clang-13', extras: 'llvm-13', platforms: 'linux/amd64' }
- { os: 'focal', baseruby: '2.7', tag: 'clang-12', extras: 'llvm-12' }
- { os: 'focal', baseruby: '2.7', tag: 'clang-11', extras: 'llvm-11' }
- { os: 'focal', baseruby: '2.7', tag: 'clang-10', extras: 'llvm-10' }
- { os: 'focal', baseruby: '2.7', tag: 'clang-9', extras: 'llvm-9' }
- { os: 'focal', baseruby: '2.7', tag: 'clang-8', extras: 'llvm-8' }
- { os: 'focal', baseruby: '2.7', tag: 'clang-7', extras: 'llvm-7' }
- { os: 'focal', baseruby: '2.7', tag: 'clang-6.0', extras: 'llvm-6.0' }

- { os: 'focal', build_ruby: '3.0', tag: 'mingw-w64' }
- { os: 'focal', build_ruby: '3.0', tag: 'crossbuild-essential-arm64' }
- { os: 'focal', build_ruby: '3.0', tag: 'crossbuild-essential-ppc64el' }
- { os: 'focal', build_ruby: '3.0', tag: 'crossbuild-essential-s390x' }
- { os: 'focal', baseruby: '2.7', tag: 'mingw-w64' }
- { os: 'focal', baseruby: '2.7', tag: 'crossbuild-essential-arm64' }
- { os: 'focal', baseruby: '2.7', tag: 'crossbuild-essential-ppc64el' }
- { os: 'focal', baseruby: '2.7', tag: 'crossbuild-essential-s390x' }

name: Publish ${{ matrix.entry.tag }}
runs-on: ubuntu-latest
Expand All @@ -59,22 +58,11 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.ACCESS_TOKEN }}
registry: ghcr.io
- name: Resolve build_ruby version
uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0
with:
ruby-version: '${{ matrix.entry.build_ruby }}'
bundler: none
if: ${{ matrix.entry.build_ruby != '' }}
- name: Set build_ruby version
id: build_ruby
run: ruby -e 'puts "::set-output name=version::#{RUBY_VERSION}"'
if: ${{ matrix.entry.build_ruby != '' }}
- uses: docker/build-push-action@v4
with:
build-args: |
version=${{ matrix.entry.os }}
build_ruby=${{ steps.build_ruby.outputs.version }}
system_ruby=${{ matrix.entry.system_ruby }}
baseruby=${{ matrix.entry.baseruby }}
packages=${{ matrix.entry.tag }} ${{ matrix.entry.extras }}
cache-from: type=gha
cache-to: type=gha
Expand Down
14 changes: 4 additions & 10 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
ARG os=ubuntu
ARG version=
ARG variant=
ARG build_ruby=
ARG system_ruby=
ARG baseruby=
ARG packages=

FROM ${os}:${version}${variant} as assets
Expand Down Expand Up @@ -47,8 +46,7 @@ RUN wget \
-y

FROM ${os}:${version}${variant} as compilers
ARG build_ruby
ARG system_ruby
ARG baseruby
ARG packages

LABEL [email protected]
Expand All @@ -61,16 +59,12 @@ COPY --from=assets /rust /rust
ENV RUSTUP_HOME=/rust/rustup
ENV PATH=${PATH}:/rust/cargo/bin

COPY build_ruby.sh /tmp
RUN set -ex \
&& apt-get update \
&& apt-get install ${packages} \
libjemalloc-dev openssl libyaml-dev tzdata valgrind wget ca-certificates sudo docker.io \
libjemalloc-dev openssl libyaml-dev ruby tzdata valgrind sudo docker.io \
libreadline-dev libcapstone-dev \
&& apt-get build-dep ruby${system_ruby} \
&& bash -c "if [[ -n '$system_ruby' ]]; then apt-get install 'ruby${system_ruby}'; fi" \
&& bash -c "if [[ -n '$build_ruby' ]]; then /tmp/build_ruby.sh '$build_ruby'; fi" \
&& rm /tmp/build_ruby.sh
&& apt-get build-dep ruby${baseruby}

RUN adduser --disabled-password --gecos '' ci && adduser ci sudo

Expand Down
16 changes: 0 additions & 16 deletions build_ruby.sh
View file
Open in desktop

This file was deleted.

Loading