diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bebefa0..f0f3009 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -264,13 +264,8 @@ jobs: # The branch is rewritten from scratch every time rather than added to, # so the repository keeps one copy of the packages instead of a new - # ~70 MB set per commit. The same commit is then mirrored to Forgejo - # when FORGEJO_TOKEN is set (git.dvorakmortonxd.dev). + # ~70 MB set per commit. - name: Push to builds branch - env: - FORGEJO_TOKEN: ${{ secrets.FORGEJO_TOKEN }} - FORGEJO_USER: ${{ secrets.FORGEJO_USER }} - FORGEJO_URL: ${{ secrets.FORGEJO_URL }} run: | git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" @@ -285,52 +280,3 @@ jobs: git add -A git commit -q -m "Build from ${{ github.sha }}" git push -f origin builds - if [ -z "${FORGEJO_TOKEN:-}" ]; then - echo "No FORGEJO_TOKEN; skipping Forgejo builds publish." - exit 0 - fi - # Prefer Basic auth over URL userinfo so tokens with @/: never - # break the URL. Force-push: this is a one-way GitHub → Forgejo - # mirror (repo moved to edu/; non-ff rejects otherwise). - token="$(printf '%s' "$FORGEJO_TOKEN" | tr -d '\r\n')" - user="$(printf '%s' "${FORGEJO_USER:-}" | tr -d '\r\n')" - user="${user:-oauth2}" - basic="$(printf '%s:%s' "$user" "$token" | base64 -w0)" - forgejo_url="${FORGEJO_URL:-https://git.dvorakmortonxd.dev/edu/Graduately.git}" - git -c "http.extraHeader=Authorization: Basic ${basic}" push -f \ - "$forgejo_url" \ - HEAD:refs/heads/builds - - forgejo-main: - name: Mirror main to Forgejo - runs-on: ubuntu-latest - steps: - # Full history: Forgejo rejects "shallow update" when replacing main. - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - # Same rule as the macOS cert step: never put `secrets` in `if:`. - - name: Push main - env: - FORGEJO_TOKEN: ${{ secrets.FORGEJO_TOKEN }} - FORGEJO_USER: ${{ secrets.FORGEJO_USER }} - FORGEJO_URL: ${{ secrets.FORGEJO_URL }} - run: | - set -euo pipefail - token="$(printf '%s' "${FORGEJO_TOKEN:-}" | tr -d '\r\n')" - if [ -z "$token" ]; then - echo "No FORGEJO_TOKEN; skipping Forgejo main mirror." - exit 0 - fi - # Belt-and-suspenders if a future checkout change re-shallows. - if git rev-parse --is-shallow-repository 2>/dev/null | grep -qx true; then - git fetch --unshallow origin - fi - user="$(printf '%s' "${FORGEJO_USER:-}" | tr -d '\r\n')" - user="${user:-oauth2}" - basic="$(printf '%s:%s' "$user" "$token" | base64 -w0)" - forgejo_url="${FORGEJO_URL:-https://git.dvorakmortonxd.dev/edu/Graduately.git}" - git -c "http.extraHeader=Authorization: Basic ${basic}" push -f \ - "$forgejo_url" \ - HEAD:refs/heads/main diff --git a/README.md b/README.md index 42184dc..bed80d7 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,7 @@ data/ style.css, changelog.txt, share/, cetba/*.json assets/ zdrojová ikona a screenshoty installers/ instalátory, které stáhnou aktuální build scripts/ balení AppImage, .app, IPA, extract a smoke test -.github/workflows/ CI: push na main → větev builds (+ zrcadlo Forgejo) +.github/workflows/ CI: push na main → větev builds progress/ vzniká za běhu (cvičení, nastavení) ``` @@ -355,7 +355,7 @@ data/ style.css, changelog.txt, share/, cetba/*.json assets/ source icon and screenshots installers/ fetch-the-latest installers scripts/ AppImage / .app / IPA bundlers, extract, smoke test -.github/workflows/ CI: push to main → builds branch (+ Forgejo mirror) +.github/workflows/ CI: push to main → builds branch progress/ created at runtime (exercises, settings) ``` diff --git a/data/changelog.txt b/data/changelog.txt index af74149..c7f47fe 100644 --- a/data/changelog.txt +++ b/data/changelog.txt @@ -7,7 +7,7 @@ # en: bullet --- 2026-09-23 -cs: Repozitář se jmenuje Graduately (GitHub i Forgejo); instalátory a updater míří tam +cs: Repozitář se jmenuje Graduately; instalátory a updater míří tam cs: Balíčky a instalátory se jmenují graduately-* (už ne maturita-*) cs: Aplikace se jmenuje Graduately; úvod stále říká „Maturita? To dáme.“ cs: Kompletní maturitní četba (82 knih) se zápisky, kvízem a sestavením děje @@ -15,8 +15,7 @@ cs: Studium knih: nejdřív procvičení (kvíz / sestavte děj), pak zápisky cs: Kvíz a sestavení děje u všech knih i na GTK (Linux / Windows) cs: Větší a čitelnější rozhraní na Macu cs: Opravy výběru slov v dialogu a otevření knihy z vyhledávání -cs: Oprava zrcadlení na Forgejo (edu/Graduately, plná historie, force-push) -en: Repository renamed to Graduately (GitHub and Forgejo); installers and updater follow +en: Repository renamed to Graduately; installers and updater follow en: Packages and installers are now graduately-* (no more maturita-*) en: The app is now Graduately; the welcome line still says “Maturita? We've got this.” en: Full maturita reading list (82 books) with notes, quiz, and plot ordering @@ -24,7 +23,6 @@ en: Book study flow: practice first (quiz / order the plot), then notes en: Quiz and plot assembly for every book on GTK too (Linux / Windows) en: Larger, more readable Mac interface en: Fixes for dialogue word picking and opening a book from search -en: Forgejo mirror fix (edu/Graduately, full history, force-push) --- 2026-09-18 cs: Po aktualizaci se na hlavní stránce ukáže, co je nového