a2nr
/
velxio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: update version to 2.0.1, enhance Discord release notification workflow, and mark subproject commits as dirty

This commit is contained in:
David Montero Crespo 2026-04-07 14:12:10 -03:00
parent 4b473ade6a
commit d789a2c7e2
2 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
.github/workflows/discord-release-notify.yml vendored
View File

@ -1,15 +1,16 @@
name: Discord — Release Merge Notification name: Discord — Release Merge Notification
on: on:
push: pull_request:
types:
- closed
branches: branches:
- release - release
# Evitar loop infinito: el bot hace push del CHANGELOG, lo que volveria a disparar este workflow.
# Con este condicional saltamos si el pusher es el propio bot.
jobs: jobs:
notify: notify:
if: github.actor != 'github-actions[bot]' # Solo cuando el PR fue efectivamente mergeado (no cerrado sin merge)
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:
contents: write # necesario para pushear CHANGELOG.md contents: write # necesario para pushear CHANGELOG.md
@ -20,6 +21,7 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
ref: release
- name: Configure git identity - name: Configure git identity
run: | run: |
@ -29,9 +31,9 @@ jobs:
- name: Generate CHANGELOG entry, commit, then send Discord announcement - name: Generate CHANGELOG entry, commit, then send Discord announcement
uses: actions/github-script@v7 uses: actions/github-script@v7
env: env:
DAVEAGENT_API_KEY: ${{ secrets.DAVEAGENT_API_KEY }} DAVEAGENT_API_KEY: ${{ secrets.DAVEAGENT_API_KEY }}
DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_BOT_TOKEN }} DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_BOT_TOKEN }}
DISCORD_CHANNEL_ID: ${{ secrets.DISCORD_CHANNEL_ID }} DISCORD_CHANNEL_ID: ${{ secrets.DISCORD_CHANNEL_ID }}
with: with:
script: | script: |
const { execSync } = require('child_process'); const { execSync } = require('child_process');
@ -70,38 +72,38 @@ jobs:
} }
// ── Version ────────────────────────────────────────────────────── // ── Version ──────────────────────────────────────────────────────
let version = '2.0.0'; let version = '2.0.1';
try { try {
const pkg = JSON.parse(fs.readFileSync('frontend/package.json', 'utf8')); const pkg = JSON.parse(fs.readFileSync('frontend/package.json', 'utf8'));
version = pkg.version ?? '2.0.0'; version = pkg.version ?? '2.0.1';
} catch {} } catch {}
console.log(`Version: v${version}`); console.log(`Version: v${version}`);
// ── Rango del merge ─────────────────────────────────────────────── // ── Rango exacto del PR mergeado ──────────────────────────────────
const sha = context.sha; // base.sha = tip de release ANTES del merge
const parents = git(`cat-file -p ${sha}`) // head.sha = tip de la rama fuente (master u otra)
.split('\n').filter(l => l.startsWith('parent')); const pr = context.payload.pull_request;
const isMerge = parents.length >= 2; const baseSha = pr.base.sha;
const baseRef = isMerge ? `${sha}^1` : `${sha}^`; const headSha = pr.head.sha;
const headRef = isMerge ? `${sha}^2` : sha; const sourceBranch = pr.head.ref; // ej: "master"
const prTitle = pr.title ?? '';
const prBody = pr.body ?? '';
console.log(`PR: #${pr.number} "${prTitle}"`);
console.log(`Range: ${baseSha.slice(0,7)}..${headSha.slice(0,7)} (${sourceBranch} → release)`);
// Commits que entraron (con hash + subject + body + autor) // Commits que entraron (con hash + subject + body + autor)
const rawLog = git( const commits = git(
`log ${baseRef}..${headRef} --pretty=format:"%h||%s||%b||%an|||" --no-merges` `log ${baseSha}..${headSha} --pretty=format:"%h||%s||%b||%an|||" --no-merges`
); ) || git(`log -30 --pretty=format:"%h||%s||%b||%an|||" --no-merges`);
const commits = rawLog || git(
`log -30 --pretty=format:"%h||%s||%b||%an|||" --no-merges`
);
// Lineas simples para el anuncio Discord // Lineas simples para el anuncio Discord
const commitLines = git( const commitLines = git(
`log ${baseRef}..${headRef} --pretty=format:"%h %s" --no-merges` `log ${baseSha}..${headSha} --pretty=format:"%h %s" --no-merges`
) || git(`log -20 --pretty=format:"%h %s" --no-merges`); ) || git(`log -20 --pretty=format:"%h %s" --no-merges`);
const changedFiles = git(`diff --name-only ${baseRef}..${headRef}`) const changedFiles = git(`diff --name-only ${baseSha}..${headSha}`)
.split('\n').filter(Boolean); .split('\n').filter(Boolean);
const diffSummary = git(`diff --stat ${baseRef}..${headRef}`)
.split('\n').filter(Boolean).pop() ?? '';
console.log(`Commits found: ${commitLines.split('\n').filter(Boolean).length}`); console.log(`Commits found: ${commitLines.split('\n').filter(Boolean).length}`);
console.log(`Files changed: ${changedFiles.length}`); console.log(`Files changed: ${changedFiles.length}`);
@ -113,6 +115,10 @@ jobs:
Velxio is a fully local, open-source Arduino/RP2040 emulator and circuit simulator. Velxio is a fully local, open-source Arduino/RP2040 emulator and circuit simulator.
PR TITLE: ${prTitle}
PR DESCRIPTION: ${prBody}
SOURCE BRANCH: ${sourceBranch}
GIT COMMITS (hash||subject||body||author): GIT COMMITS (hash||subject||body||author):
${commits} ${commits}
@ -146,15 +152,11 @@ jobs:
let changelogContent; let changelogContent;
if (!fs.existsSync(changelogPath)) { if (!fs.existsSync(changelogPath)) {
changelogContent = `# Changelog changelogContent = '# Changelog\n\n'
+ 'All notable changes to Velxio will be documented in this file.\n'
All notable changes to Velxio will be documented in this file. + 'The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).\n\n'
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). + changelogEntry + '\n\n'
+ `[${version}]: https://github.com/davidmonterocrespo24/velxio/releases/tag/v${version}\n`;
${changelogEntry}
[${version}]: https://github.com/davidmonterocrespo24/velxio/releases/tag/v${version}
`;
} else { } else {
const existing = fs.readFileSync(changelogPath, 'utf8'); const existing = fs.readFileSync(changelogPath, 'utf8');
const lines = existing.split('\n'); const lines = existing.split('\n');
@ -271,8 +273,8 @@ jobs:
// ────────────────────────────────────────────────────────────────── // ──────────────────────────────────────────────────────────────────
// FASE 3 — Enviar a Discord via Bot API // FASE 3 — Enviar a Discord via Bot API
// ────────────────────────────────────────────────────────────────── // ──────────────────────────────────────────────────────────────────
const botToken = process.env.DISCORD_BOT_TOKEN; const botToken = process.env.DISCORD_BOT_TOKEN;
const channelId = process.env.DISCORD_CHANNEL_ID; const channelId = process.env.DISCORD_CHANNEL_ID;
if (!botToken || !channelId) { if (!botToken || !channelId) {
core.setFailed('DISCORD_BOT_TOKEN or DISCORD_CHANNEL_ID secret not configured'); core.setFailed('DISCORD_BOT_TOKEN or DISCORD_CHANNEL_ID secret not configured');
return; return;
@ -298,4 +300,4 @@ jobs:
console.log('='.repeat(70)); console.log('='.repeat(70));
console.log(`Release v${version} announced on Discord`); console.log(`Release v${version} announced on Discord`);
console.log(`Commits: ${commitLines.split('\n').filter(Boolean).length} | Files: ${changedFiles.length}`); console.log(`PR #${pr.number} | Commits: ${commitLines.split('\n').filter(Boolean).length} | Files: ${changedFiles.length}`);

2
frontend/package.json
View File

@ -2,7 +2,7 @@
"name": "velxio", "name": "velxio",
"homepage": "https://velxio.dev", "homepage": "https://velxio.dev",
"private": true, "private": true,
"version": "1.0.0", "version": "2.0.1",
"type": "module", "type": "module",
"scripts": { "scripts": {
"generate:metadata": "cd .. && npx tsx scripts/generate-component-metadata.ts", "generate:metadata": "cd .. && npx tsx scripts/generate-component-metadata.ts",