From 5e674c4ad665f3ac3144c63a98900140c780469c Mon Sep 17 00:00:00 2001 From: benmelz Date: Wed, 1 Apr 2026 13:03:34 -0400 Subject: [PATCH 1/7] use shared workflows for ci --- .github/workflows/ci.yml | 17 ----------------- .github/workflows/integrate.yml | 15 +++++++++++++++ .github/workflows/pull_request.yml | 8 ++++++++ .github/workflows/push.yml | 10 ++++++++++ 4 files changed, 33 insertions(+), 17 deletions(-) delete mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/integrate.yml create mode 100644 .github/workflows/pull_request.yml create mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 0005d25..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: ci -permissions: - contents: read -on: - pull_request: - branches: - - main - push: - branches: - - main -jobs: - main: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - - uses: ./.github/actions/setup - - run: bin/rake diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml new file mode 100644 index 0000000..9378123 --- /dev/null +++ b/.github/workflows/integrate.yml @@ -0,0 +1,15 @@ +on: + workflow_call: +jobs: + docker: + name: app + uses: umts/.github/.github/workflows/docker.yml@main + haml-lint: + name: app + uses: umts/.github/.github/workflows/haml-lint.yml@main + rspec: + name: app + uses: umts/.github/.github/workflows/rspec.yml@main + rubocop: + name: app + uses: umts/.github/.github/workflows/rubocop.yml@main diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 0000000..b2b9e45 --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,8 @@ +name: pull_request +permissions: + contents: read +on: + pull_request: +jobs: + integrate: + uses: ./.github/workflows/integrate.yml diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 0000000..2cd7752 --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,10 @@ +name: push +permissions: + contents: read +on: + push: + branches: + - main +jobs: + integrate: + uses: ./.github/workflows/integrate.yml From c047e9ca07a9985cdf38cbbd2742836430ee9da9 Mon Sep 17 00:00:00 2001 From: benmelz Date: Fri, 3 Apr 2026 10:56:33 -0400 Subject: [PATCH 2/7] test new rspec workflow --- .github/workflows/integrate.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml index 9378123..9cdeb4f 100644 --- a/.github/workflows/integrate.yml +++ b/.github/workflows/integrate.yml @@ -9,7 +9,10 @@ jobs: uses: umts/.github/.github/workflows/haml-lint.yml@main rspec: name: app - uses: umts/.github/.github/workflows/rspec.yml@main + uses: umts/.github/.github/workflows/rspec.yml@bb2aadccc5d3ff0792564d83caa49ec75e29fb66 + with: + node: true + rack: true rubocop: name: app uses: umts/.github/.github/workflows/rubocop.yml@main From 5b0a25d653f1e5f312d145c25c1a024408c94db3 Mon Sep 17 00:00:00 2001 From: benmelz Date: Fri, 3 Apr 2026 10:57:56 -0400 Subject: [PATCH 3/7] set node version --- .node-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .node-version diff --git a/.node-version b/.node-version new file mode 100644 index 0000000..8e35034 --- /dev/null +++ b/.node-version @@ -0,0 +1 @@ +24.14.1 From f53fb6cb1a80a6f5d6e0577ec0fa830c9c9e5988 Mon Sep 17 00:00:00 2001 From: benmelz Date: Fri, 3 Apr 2026 11:01:09 -0400 Subject: [PATCH 4/7] test new workflow --- .github/workflows/integrate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml index 9cdeb4f..9b74587 100644 --- a/.github/workflows/integrate.yml +++ b/.github/workflows/integrate.yml @@ -9,7 +9,7 @@ jobs: uses: umts/.github/.github/workflows/haml-lint.yml@main rspec: name: app - uses: umts/.github/.github/workflows/rspec.yml@bb2aadccc5d3ff0792564d83caa49ec75e29fb66 + uses: umts/.github/.github/workflows/rspec.yml@384a4e64b8b22a06e3e237f3d939ffea78321b60 with: node: true rack: true From e7e518f4a8e6b1d519e449e99c64f33821016426 Mon Sep 17 00:00:00 2001 From: benmelz Date: Fri, 3 Apr 2026 11:01:18 -0400 Subject: [PATCH 5/7] rack is no longer an option --- .github/workflows/integrate.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml index 9b74587..4550466 100644 --- a/.github/workflows/integrate.yml +++ b/.github/workflows/integrate.yml @@ -12,7 +12,6 @@ jobs: uses: umts/.github/.github/workflows/rspec.yml@384a4e64b8b22a06e3e237f3d939ffea78321b60 with: node: true - rack: true rubocop: name: app uses: umts/.github/.github/workflows/rubocop.yml@main From fa59e88d2013ccf9166510aa190cb665c1b22523 Mon Sep 17 00:00:00 2001 From: benmelz Date: Fri, 3 Apr 2026 11:04:18 -0400 Subject: [PATCH 6/7] go back to main, throw in stylelint --- .github/workflows/integrate.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml index 4550466..556ffa6 100644 --- a/.github/workflows/integrate.yml +++ b/.github/workflows/integrate.yml @@ -9,9 +9,12 @@ jobs: uses: umts/.github/.github/workflows/haml-lint.yml@main rspec: name: app - uses: umts/.github/.github/workflows/rspec.yml@384a4e64b8b22a06e3e237f3d939ffea78321b60 + uses: umts/.github/.github/workflows/rspec.yml@main with: node: true rubocop: name: app uses: umts/.github/.github/workflows/rubocop.yml@main + stylelint: + name: app + users: umts/.github/.github/workflows/stylelint.yml@main From 1e348e8838f54d680ad4a59caa1d2a2121effc51 Mon Sep 17 00:00:00 2001 From: benmelz Date: Fri, 3 Apr 2026 11:05:09 -0400 Subject: [PATCH 7/7] typo --- .github/workflows/integrate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml index 556ffa6..2fcc468 100644 --- a/.github/workflows/integrate.yml +++ b/.github/workflows/integrate.yml @@ -17,4 +17,4 @@ jobs: uses: umts/.github/.github/workflows/rubocop.yml@main stylelint: name: app - users: umts/.github/.github/workflows/stylelint.yml@main + uses: umts/.github/.github/workflows/stylelint.yml@main