ci: fix dx GLIBC incompatibility and remove branch gates
Some checks failed
Some checks failed
- Replace cargo-binstall with cargo install for dioxus-cli to avoid GLIBC 2.38/2.39 requirement on Bookworm (GLIBC 2.36) - Run bun install in Dockerfile for DaisyUI/Tailwind dependencies - Remove branch gates on build-and-push and changelog jobs for testing Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -103,9 +103,6 @@ jobs:
|
||||
name: Build & Push Image
|
||||
runs-on: docker
|
||||
needs: [test]
|
||||
if: >-
|
||||
github.event_name == 'push' &&
|
||||
(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/'))
|
||||
steps:
|
||||
- name: Checkout
|
||||
run: |
|
||||
@@ -150,9 +147,6 @@ jobs:
|
||||
name: Changelog
|
||||
runs-on: docker
|
||||
needs: [test]
|
||||
if: >-
|
||||
github.event_name == 'push' &&
|
||||
(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/'))
|
||||
container:
|
||||
image: rust:1.89-bookworm
|
||||
steps:
|
||||
|
||||
12
Dockerfile
12
Dockerfile
@@ -19,12 +19,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
RUN curl -fsSL https://bun.sh/install | bash
|
||||
ENV PATH="/root/.bun/bin:$PATH"
|
||||
|
||||
# Install dx CLI via cargo-binstall
|
||||
RUN curl -L --proto '=https' --tlsv1.2 -sSf \
|
||||
https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh \
|
||||
| bash
|
||||
RUN cargo binstall dioxus-cli@0.7.3 --root /.cargo -y --force
|
||||
ENV PATH="/.cargo/bin:$PATH"
|
||||
# Install dx CLI from source (binstall binaries require GLIBC >= 2.38)
|
||||
RUN cargo install dioxus-cli@0.7.3 --locked
|
||||
|
||||
# Cook dependencies from recipe (cached layer)
|
||||
COPY --from=planner /app/recipe.json recipe.json
|
||||
@@ -33,8 +29,8 @@ RUN cargo chef cook --release --recipe-path recipe.json
|
||||
# Copy source and build
|
||||
COPY . .
|
||||
|
||||
# Ensure styles directory exists for build.rs tailwind step
|
||||
RUN mkdir -p styles && touch styles/input.css
|
||||
# Install frontend dependencies (DaisyUI, Tailwind) for the build.rs CSS step
|
||||
RUN bun install --frozen-lockfile
|
||||
|
||||
# Bundle the fullstack application
|
||||
RUN dx bundle --platform fullstack
|
||||
|
||||
Reference in New Issue
Block a user