Author SHA1 Message Date
dependabot[bot] d6c562b012 Bump tailwind-merge from 3.6.0 to 3.7.0
Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge/tree/HEAD/packages/tailwind-merge) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/commits/[email protected]/packages/tailwind-merge)

---
updated-dependencies:
- dependency-name: tailwind-merge
  dependency-version: 3.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
2026-09-19 14:32:57 +00:00
djkotowski c0be5deab6 Gate Pages deploy on ci-test passing (#238)
A merge to main could break the app even though the PR check ran
ci-test separately; deploy previously fired on push regardless of
CI outcome. Trigger deploy via workflow_run on ci-test completion
instead, and skip the build job unless ci-test concluded success,
so a broken main no longer publishes to Pages.
2026-07-21 09:43:45 -05:00
2 changed files with 17 additions and 10 deletions

No files matched your search

+13 -6
View File
@@ -1,18 +1,22 @@
name: deploy name: deploy
run-name: "${{ github.actor }} is deploying ${{ github.sha }}" run-name: "${{ github.actor }} is deploying ${{ github.event.workflow_run.head_sha }}"
on: on:
push: workflow_run:
branches: workflows: ['ci-test']
- 'main' types: [completed]
branches: ['main']
concurrency: concurrency:
group: pages group: pages
cancel-in-progress: false cancel-in-progress: false
jobs: jobs:
build: build:
if: github.event.workflow_run.conclusion == 'success'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v7 uses: actions/checkout@v7
with:
ref: ${{ github.event.workflow_run.head_sha }}
- name: Setup pnpm - name: Setup pnpm
uses: pnpm/action-setup@v5 uses: pnpm/action-setup@v5
- name: Setup Node.js - name: Setup Node.js
@@ -41,6 +45,8 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v7 uses: actions/checkout@v7
with:
ref: ${{ github.event.workflow_run.head_sha }}
- name: Deploy to GitHub Pages - name: Deploy to GitHub Pages
id: deployment id: deployment
uses: actions/deploy-pages@v5 uses: actions/deploy-pages@v5
@@ -48,6 +54,7 @@ jobs:
run: | run: |
git config user.name "github-actions[bot]" git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com" git config user.email "github-actions[bot]@users.noreply.github.com"
tag="deploy-$(date +%Y-%m-%d)-${GITHUB_SHA::7}" sha="${{ github.event.workflow_run.head_sha }}"
git tag "$tag" tag="deploy-$(date +%Y-%m-%d)-${sha::7}"
git tag "$tag" "$sha"
git push origin "$tag" git push origin "$tag"
+4 -4
View File
@@ -10,7 +10,7 @@ importers:
dependencies: dependencies:
tailwind-merge: tailwind-merge:
specifier: ^3.1.0 specifier: ^3.1.0
version: 3.6.0 version: 3.7.0
devDependencies: devDependencies:
'@sveltejs/vite-plugin-svelte': '@sveltejs/vite-plugin-svelte':
specifier: ^7.2.0 specifier: ^7.2.0
@@ -508,8 +508,8 @@ packages:
resolution: {integrity: sha512-p4HDLDogGHKRKCrgckQHNs5PEfXkju6JI5jTywueaKJI5hAdjPohEhRtQ0M1SWC/+TA73SPln+r7srr+7e4nZA==} resolution: {integrity: sha512-p4HDLDogGHKRKCrgckQHNs5PEfXkju6JI5jTywueaKJI5hAdjPohEhRtQ0M1SWC/+TA73SPln+r7srr+7e4nZA==}
engines: {node: '>=18'} engines: {node: '>=18'}
tailwind-merge@3.6.0: tailwind-merge@3.7.0:
resolution: {integrity: sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==} resolution: {integrity: sha512-XPPUyAc+cvspz3lHTcR/QgPfW2A0lv/xQNIjX3HGhLR+Nq2lHaLq5MtTesHn8GUr3W3DguT2KT5x3NVgRtYwmA==}
[email protected]: [email protected]:
resolution: {integrity: sha512-gOhV3P7ufE62QDGg1zVaTgCR+EtPv92k2nIhVcVKcLmxT1sUBsQGhnZj175j+MqRt4zLF7ic+sCYjfhxMxj7YQ==} resolution: {integrity: sha512-gOhV3P7ufE62QDGg1zVaTgCR+EtPv92k2nIhVcVKcLmxT1sUBsQGhnZj175j+MqRt4zLF7ic+sCYjfhxMxj7YQ==}
@@ -955,7 +955,7 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- '@typescript-eslint/types' - '@typescript-eslint/types'
tailwind-merge@3.6.0: {} tailwind-merge@3.7.0: {}
[email protected]: {} [email protected]: {}