Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
50afc3111d | ||
|
|
1417722438 | ||
|
|
1973c3c5ca | ||
|
|
0f8e411b92 | ||
|
|
4b04e43ff8 |
10
.github/workflows/deploy.yml
vendored
10
.github/workflows/deploy.yml
vendored
@@ -57,6 +57,10 @@ jobs:
|
||||
type=ref,event=pr
|
||||
type=raw,value=latest,enable={{is_default_branch}}
|
||||
|
||||
- name: Get short commit SHA
|
||||
id: vars
|
||||
run: echo "short_sha=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Build and push Docker image
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
@@ -64,3 +68,9 @@ jobs:
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
build-args: |
|
||||
GIT_COMMIT=${{ github.sha }}
|
||||
GIT_COMMIT_SHORT=${{ steps.vars.outputs.short_sha }}
|
||||
GIT_BRANCH=${{ github.ref_name }}
|
||||
GIT_TAG=${{ github.ref_type == 'tag' && github.ref_name || '' }}
|
||||
GIT_DIRTY=false
|
||||
|
||||
14
CHANGELOG.md
14
CHANGELOG.md
@@ -1,3 +1,17 @@
|
||||
## [4.14.2](https://github.com/antialias/soroban-abacus-flashcards/compare/v4.14.1...v4.14.2) (2025-10-19)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **docker:** add packages/templates for Typst flashcard generation ([1417722](https://github.com/antialias/soroban-abacus-flashcards/commit/14177224380b8c37413123bee344c9b762055a15))
|
||||
|
||||
## [4.14.1](https://github.com/antialias/soroban-abacus-flashcards/compare/v4.14.0...v4.14.1) (2025-10-19)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **deployment:** pass git info to Docker build for deployment info modal ([4b04e43](https://github.com/antialias/soroban-abacus-flashcards/commit/4b04e43ff8c9e9f239d7f5e306aab338b535296f))
|
||||
|
||||
## [4.14.0](https://github.com/antialias/soroban-abacus-flashcards/compare/v4.13.15...v4.14.0) (2025-10-19)
|
||||
|
||||
|
||||
|
||||
18
Dockerfile
18
Dockerfile
@@ -21,6 +21,21 @@ RUN pnpm install --frozen-lockfile
|
||||
|
||||
# Builder stage
|
||||
FROM base AS builder
|
||||
|
||||
# Accept git information as build arguments
|
||||
ARG GIT_COMMIT
|
||||
ARG GIT_COMMIT_SHORT
|
||||
ARG GIT_BRANCH
|
||||
ARG GIT_TAG
|
||||
ARG GIT_DIRTY
|
||||
|
||||
# Set as environment variables for build scripts
|
||||
ENV GIT_COMMIT=${GIT_COMMIT}
|
||||
ENV GIT_COMMIT_SHORT=${GIT_COMMIT_SHORT}
|
||||
ENV GIT_BRANCH=${GIT_BRANCH}
|
||||
ENV GIT_TAG=${GIT_TAG}
|
||||
ENV GIT_DIRTY=${GIT_DIRTY}
|
||||
|
||||
COPY . .
|
||||
|
||||
# Generate Panda CSS styled-system before building
|
||||
@@ -58,6 +73,9 @@ COPY --from=builder --chown=nextjs:nodejs /app/apps/web/node_modules ./apps/web/
|
||||
# Copy core package (needed for Python flashcard generation scripts)
|
||||
COPY --from=builder --chown=nextjs:nodejs /app/packages/core ./packages/core
|
||||
|
||||
# Copy templates package (needed for Typst templates)
|
||||
COPY --from=builder --chown=nextjs:nodejs /app/packages/templates ./packages/templates
|
||||
|
||||
# Install Python dependencies for flashcard generation
|
||||
RUN pip3 install --no-cache-dir --break-system-packages -r packages/core/requirements.txt
|
||||
|
||||
|
||||
@@ -18,11 +18,13 @@ function exec(command) {
|
||||
}
|
||||
|
||||
function getBuildInfo() {
|
||||
const gitCommit = exec('git rev-parse HEAD')
|
||||
const gitCommitShort = exec('git rev-parse --short HEAD')
|
||||
const gitBranch = exec('git rev-parse --abbrev-ref HEAD')
|
||||
const gitTag = exec('git describe --tags --exact-match 2>/dev/null')
|
||||
const gitDirty = exec('git diff --quiet || echo "dirty"') === 'dirty'
|
||||
// Try to get git info from environment variables first (for Docker builds)
|
||||
// Fall back to git commands (for local development)
|
||||
const gitCommit = process.env.GIT_COMMIT || exec('git rev-parse HEAD')
|
||||
const gitCommitShort = process.env.GIT_COMMIT_SHORT || exec('git rev-parse --short HEAD')
|
||||
const gitBranch = process.env.GIT_BRANCH || exec('git rev-parse --abbrev-ref HEAD')
|
||||
const gitTag = process.env.GIT_TAG || exec('git describe --tags --exact-match 2>/dev/null')
|
||||
const gitDirty = process.env.GIT_DIRTY === 'true' || exec('git diff --quiet || echo "dirty"') === 'dirty'
|
||||
|
||||
const packageJson = require('../package.json')
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "soroban-monorepo",
|
||||
"version": "4.14.0",
|
||||
"version": "4.14.2",
|
||||
"private": true,
|
||||
"description": "Beautiful Soroban Flashcard Generator - Monorepo",
|
||||
"workspaces": [
|
||||
|
||||
@@ -305,7 +305,7 @@
|
||||
<div class="stats">
|
||||
<div class="stats-info">
|
||||
<strong>13</strong> examples rendered
|
||||
• Generated on 10/12/2025 at 2:30:55 AM
|
||||
• Generated on 10/19/2025 at 2:34:30 AM
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user