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

github: add Ruby 3.4 for CI #118

Merged
merged 3 commits into from
Feb 7, 2025
Merged

github: add Ruby 3.4 for CI #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba809e7
github: use latest actions
kenhys Feb 6, 2025
8d0c17f
github: add Ruby 3.4 for CI
kenhys Feb 6, 2025
acd2014
github: simplify with matrix
kenhys Feb 6, 2025
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
75 changes: 22 additions & 53 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,67 +6,36 @@ on:
- master

jobs:
ubuntu:
docker:
name: ${{ matrix.target.env }}
strategy:
matrix:
target:
- env: ubuntu
dockerfile: Dockerfile.ubuntu
- env: td-agent-deb
dockerfile: Dockerfile.tdagent-ubuntu
- env: td-agent-rpm
dockerfile: Dockerfile.tdagent-almalinux
- env: ruby32
dockerfile: Dockerfile.ruby32
- env: ruby34
dockerfile: Dockerfile.ruby34
runs-on: ubuntu-latest
steps:
-
uses: actions/checkout@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
file: test/docker/Dockerfile.ubuntu
tdagent-deb:
runs-on: ubuntu-latest
steps:
-
uses: actions/checkout@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
file: test/docker/Dockerfile.tdagent-ubuntu
tdagent-rpm:
runs-on: ubuntu-latest
steps:
-
uses: actions/checkout@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
file: test/docker/Dockerfile.tdagent-almalinux
ruby32:
runs-on: ubuntu-latest
steps:
-
uses: actions/checkout@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Build and push
- uses: actions/checkout@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
file: test/docker/Dockerfile.ruby32
file: test/docker/${{ matrix.target.dockerfile }}
rubocop:
runs-on: ubuntu-latest
steps:
-
uses: actions/checkout@v3
uses: actions/checkout@v4
-
uses: ruby/setup-ruby@v1
with:
Expand Down
68 changes: 20 additions & 48 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,67 +4,39 @@ on:
pull_request:

jobs:
ubuntu:
docker:
name: ${{ matrix.target.env }}
strategy:
matrix:
target:
- env: ubuntu
dockerfile: Dockerfile.ubuntu
- env: td-agent-deb
dockerfile: Dockerfile.tdagent-ubuntu
- env: td-agent-rpm
dockerfile: Dockerfile.tdagent-almalinux
- env: ruby32
dockerfile: Dockerfile.ruby32
- env: ruby34
dockerfile: Dockerfile.ruby34
runs-on: ubuntu-latest
steps:
-
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
file: test/docker/Dockerfile.ubuntu
tdagent-deb:
runs-on: ubuntu-latest
steps:
-
uses: actions/checkout@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
file: test/docker/Dockerfile.tdagent-ubuntu
tdagent-rpm:
runs-on: ubuntu-latest
steps:
-
uses: actions/checkout@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
file: test/docker/Dockerfile.tdagent-almalinux
ruby32:
runs-on: ubuntu-latest
steps:
-
uses: actions/checkout@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
file: test/docker/Dockerfile.ruby32
file: test/docker/${{ matrix.target.dockerfile }}
rubocop:
runs-on: ubuntu-latest
steps:
-
uses: actions/checkout@v3
uses: actions/checkout@v4
-
uses: ruby/setup-ruby@v1
with:
Expand Down
7 changes: 7 additions & 0 deletions test/docker/Dockerfile.ruby34
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM ruby:3.4

WORKDIR /usr/local/src

COPY . .
RUN bundle install -j4 -r3
RUN bundle exec rake test TESTOPTS="-v"
Loading