From d6c4c57b34d284c02c94b3ef90f59d6a130852e6 Mon Sep 17 00:00:00 2001 From: benmelz Date: Wed, 1 Apr 2026 10:17:40 -0400 Subject: [PATCH] use new shared workflow for ci --- .github/actions/setup/action.yml | 8 ----- .github/workflows/ci.yml | 47 ------------------------------ .github/workflows/pull_request.yml | 8 +++++ .github/workflows/push.yml | 10 +++++++ 4 files changed, 18 insertions(+), 55 deletions(-) delete mode 100644 .github/actions/setup/action.yml delete mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/pull_request.yml create mode 100644 .github/workflows/push.yml diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml deleted file mode 100644 index 0a29eec6..00000000 --- a/.github/actions/setup/action.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: setup -description: Setup the repository -runs: - using: composite - steps: - - uses: ruby/setup-ruby@v1 - with: - bundler-cache: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 7c5d63f2..00000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: ci -permissions: - contents: read -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - rspec: - runs-on: ubuntu-latest - services: - mariadb: - image: mariadb:10.4 - env: - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true - ports: - - 3306:3306 - env: - RAILS_ENV: test - DATABASE_URL: mysql2://root@127.0.0.1:3306/stop_project_test - steps: - - uses: actions/checkout@v6 - - uses: ./.github/actions/setup - - run: bin/setup --skip-server - - run: bundle exec rspec - rubocop: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - - uses: ./.github/actions/setup - - run: bundle exec rubocop - brakeman: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - - uses: ./.github/actions/setup - - run: bundle exec brakeman --no-pager - haml-lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - - uses: ./.github/actions/setup - - run: bundle exec haml-lint diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 00000000..f661377d --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,8 @@ +name: pull_request +permissions: + contents: read +on: + pull_request: +jobs: + integrate: + uses: umts/.github/.github/workflows/integrate-rails.yml@main diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 00000000..04c27910 --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,10 @@ +name: push +permissions: + contents: read +on: + push: + branches: + - main +jobs: + integrate: + uses: umts/.github/.github/workflows/integrate-rails.yml@main