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

Use timeout v0.4.0 on AlmaLinux #1

Closed
wants to merge 4 commits into from
Closed

Use timeout v0.4.0 on AlmaLinux #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad4755f
timeout 0.4.1 or later require Ruby 2.6.0 or later but AlmaLinux 8 sh…
otegami Apr 10, 2024
d169f7e
Run CI demo
otegami Apr 10, 2024
d8d7050
gem isntall timeout with fixed version 0.4.0
otegami Apr 10, 2024
31b0121
CI test
otegami Apr 10, 2024
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
78 changes: 39 additions & 39 deletions .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Package
on:
push:
# Test
branches:
- main
- 'maintenance/**'
- '*'
tags:
- '*'
paths:
Expand Down Expand Up @@ -180,48 +180,48 @@ jobs:
fail-fast: false
matrix:
label:
- Debian GNU/Linux bullseye amd64
- Debian GNU/Linux bullseye arm64
- Debian GNU/Linux bookworm amd64
- Debian GNU/Linux bookworm arm64
- Debian GNU/Linux trixie amd64
- Debian GNU/Linux trixie arm64
- CentOS 7 x86_64
# - Debian GNU/Linux bullseye amd64
# - Debian GNU/Linux bullseye arm64
# - Debian GNU/Linux bookworm amd64
# - Debian GNU/Linux bookworm arm64
# - Debian GNU/Linux trixie amd64
# - Debian GNU/Linux trixie arm64
# - CentOS 7 x86_64
- AlmaLinux 8 x86_64
- AlmaLinux 8 aarch64
- AlmaLinux 9 x86_64
- AlmaLinux 9 aarch64
include:
- label: Debian GNU/Linux bullseye amd64
id: debian-bullseye-amd64
task-namespace: apt
target: debian-bullseye
test-docker-image: debian:bullseye
- label: Debian GNU/Linux bullseye arm64
id: debian-bullseye-arm64
task-namespace: apt
target: debian-bullseye-arm64
test-docker-image: arm64v8/debian:bullseye
- label: Debian GNU/Linux bookworm amd64
id: debian-bookworm-amd64
task-namespace: apt
target: debian-bookworm
test-docker-image: debian:bookworm
- label: Debian GNU/Linux bookworm arm64
id: debian-bookworm-arm64
task-namespace: apt
target: debian-bookworm-arm64
test-docker-image: arm64v8/debian:bookworm
- label: Debian GNU/Linux trixie amd64
id: debian-trixie-amd64
task-namespace: apt
target: debian-trixie
test-docker-image: debian:trixie
- label: Debian GNU/Linux trixie arm64
id: debian-trixie-arm64
task-namespace: apt
target: debian-trixie-arm64
test-docker-image: arm64v8/debian:trixie
# - label: Debian GNU/Linux bullseye amd64
# id: debian-bullseye-amd64
# task-namespace: apt
# target: debian-bullseye
# test-docker-image: debian:bullseye
# - label: Debian GNU/Linux bullseye arm64
# id: debian-bullseye-arm64
# task-namespace: apt
# target: debian-bullseye-arm64
# test-docker-image: arm64v8/debian:bullseye
# - label: Debian GNU/Linux bookworm amd64
# id: debian-bookworm-amd64
# task-namespace: apt
# target: debian-bookworm
# test-docker-image: debian:bookworm
# - label: Debian GNU/Linux bookworm arm64
# id: debian-bookworm-arm64
# task-namespace: apt
# target: debian-bookworm-arm64
# test-docker-image: arm64v8/debian:bookworm
# - label: Debian GNU/Linux trixie amd64
# id: debian-trixie-amd64
# task-namespace: apt
# target: debian-trixie
# test-docker-image: debian:trixie
# - label: Debian GNU/Linux trixie arm64
# id: debian-trixie-arm64
# task-namespace: apt
# target: debian-trixie-arm64
# test-docker-image: arm64v8/debian:trixie
- label: CentOS 7 x86_64
id: centos-7-x86_64
task-namespace: yum
Expand Down
4 changes: 4 additions & 0 deletions packages/yum/almalinux-8/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
source 'https://rubygems.org'

gem 'timeout', '0.4.0'
gem 'grntest'
10 changes: 9 additions & 1 deletion packages/yum/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,15 @@ if [ "${run_test}" = "yes" ]; then
gcc \
make \
redhat-rpm-config
MAKEFLAGS=-j$(nproc) gem install grntest

# timeout 0.4.1 or later require Ruby 2.6.0 or later but AlmaLinux 8 ships Ruby 2.5.
if [ "${os}-${version}" == "almalinux-8" ]; then
gem install bundler -v '2.3.27'
bundle install --gemfile=/groonga/packages/yum/almalinux-8/Gemfile
else
MAKEFLAGS=-j$(nproc) gem install timeout -v '0.4.0'
MAKEFLAGS=-j$(nproc) gem install grntest
fi

export TZ=Asia/Tokyo

Expand Down
Loading