Skip to content

Commit 6e753db

Browse files
committed
switched to proper resolver + update workflows
1 parent 64f7234 commit 6e753db

3 files changed

Lines changed: 18 additions & 3 deletions

File tree

.github/workflows/build-platform.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ on:
1919
required: true
2020
type: string
2121
description: 'Git ref to checkout (tag, branch, or SHA)'
22+
no_cache:
23+
required: false
24+
type: boolean
25+
default: false
26+
description: 'Disable Docker layer cache'
2227

2328

2429
env:
@@ -63,9 +68,10 @@ jobs:
6368
context: .
6469
platforms: ${{ inputs.platform }}
6570
push: true
71+
no-cache: ${{ inputs.no_cache }}
6672
tags: ${{ env.REGISTRY }}/${{ inputs.image_name }}:${{ inputs.version }}-${{ steps.platform.outputs.suffix }}
67-
cache-from: type=gha,scope=${{ steps.platform.outputs.suffix }}
68-
cache-to: type=gha,mode=max,scope=${{ steps.platform.outputs.suffix }}
73+
cache-from: ${{ inputs.no_cache && '' || format('type=gha,scope={0}', steps.platform.outputs.suffix) }}
74+
cache-to: ${{ inputs.no_cache && '' || format('type=gha,mode=max,scope={0}', steps.platform.outputs.suffix) }}
6975
labels: |
7076
org.opencontainers.image.source=https://github.com/${{ github.repository }}
7177
org.opencontainers.image.version=${{ inputs.version }}

.github/workflows/docker-build.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ on:
1010
description: 'Version to build (e.g., v1.0.4)'
1111
required: true
1212
type: string
13+
force_rebuild:
14+
description: 'Force rebuild (ignore cache)'
15+
required: false
16+
type: boolean
17+
default: false
1318

1419
env:
1520
REGISTRY: ghcr.io
@@ -64,6 +69,7 @@ jobs:
6469
image_name: ${{ needs.info.outputs.image_name }}
6570
version: ${{ needs.info.outputs.version }}
6671
ref: ${{ needs.info.outputs.ref }}
72+
no_cache: ${{ inputs.force_rebuild || false }}
6773

6874
build-arm64:
6975
needs: info
@@ -73,6 +79,7 @@ jobs:
7379
image_name: ${{ needs.info.outputs.image_name }}
7480
version: ${{ needs.info.outputs.version }}
7581
ref: ${{ needs.info.outputs.ref }}
82+
no_cache: ${{ inputs.force_rebuild || false }}
7683

7784
create-manifest:
7885
needs: [info, build-amd64, build-arm64]

tailwind.config.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import type {Config} from "tailwindcss";
2-
import { MARKDOWN_SAFELIST } from "@changerawr/markdown/tailwind";
2+
3+
// eslint-disable-next-line @typescript-eslint/no-require-imports
4+
const { MARKDOWN_SAFELIST } = require("@changerawr/markdown/tailwind") as { MARKDOWN_SAFELIST: string[] };
35

46
export default {
57
darkMode: ["class"],

0 commit comments

Comments
 (0)