Skip to content
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
47 changes: 35 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,39 @@ name: CI

on:
push:
branches:
- master
branches: [master]
pull_request:
branches: [master]
schedule:
- cron: '0 0 1 * *'

jobs:
ruby-versions:
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
with:
engine: cruby
min_version: 3.2
docker-ruby-base:
needs: ruby-versions
name: Ruby ${{ matrix.ruby }}
strategy:
matrix:
ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
exclude:
- ruby: head
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
- name: Build and push
id: docker_build
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
with:
file: test/docker/Dockerfile.ruby-base
build-args: |
RUBY_VERSION=${{ matrix.ruby }}

docker:
name: ${{ matrix.target.env }}
strategy:
Expand All @@ -17,10 +46,6 @@ jobs:
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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
Expand All @@ -31,14 +56,12 @@ jobs:
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
with:
file: test/docker/${{ matrix.target.dockerfile }}

rubocop:
runs-on: ubuntu-latest
steps:
-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
with:
bundler-cache: true
-
run: bundle exec rake rubocop
- run: bundle exec rake rubocop
45 changes: 0 additions & 45 deletions .github/workflows/pr.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM ruby:3.2
ARG RUBY_VERSION=3.2

FROM ruby:${RUBY_VERSION}

WORKDIR /usr/local/src

Expand Down
7 changes: 0 additions & 7 deletions test/docker/Dockerfile.ruby34

This file was deleted.

Loading