Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/copilot-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ making any changes.

- `src/main/java/com/github/backup/` – Core application classes (backup service, GitHub service, CLI runner)
- `src/main/java/com/github/backup/web/` – Spring MVC REST controller and request/response models for web mode
- `src/main/resources/` – `application.properties`, `application-web.properties`, and static web assets
- `src/main/resources/` – `application.properties`, `application-web.properties`, `application-daemon.properties`, and static web assets
- `src/test/java/` – Unit tests mirroring the main source tree

## Coding Conventions
Expand All @@ -28,6 +28,6 @@ making any changes.

## Contribution Workflow

- Branch from `develop` for all changes.
- Open a pull request against `develop`, not `main`.
- Branch from `main` for all changes.
- Open a pull request against `main`.
- Reference the related GitHub issue in every pull request description.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Build

on:
push:
branches: [ main, develop ]
branches: [ main ]
pull_request:
branches: [ main, develop ]
branches: [ main ]

jobs:
build:
Expand All @@ -13,10 +13,10 @@ jobs:
contents: read

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: '17'
distribution: 'temurin'
Expand All @@ -30,7 +30,7 @@ jobs:
contents: read

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Test entrypoint script
run: sh docker-entrypoint-test.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: '17'
distribution: 'temurin'
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- `BACKUP_INTERVAL_MS` environment variable for the Docker daemon image, mapped by `docker-entrypoint.sh` to `-Dbackup.scheduled.interval.ms`, so the backup interval can be configured from `.env`/`docker-compose.yml` without overriding the entrypoint
- `docker-entrypoint-test.sh`, a shell test that runs `docker-entrypoint.sh` against a stub `java` and asserts the argument list built for each combination of `BACKUP_DIRECTORY`, `SCHEDULED_USERS` and `BACKUP_INTERVAL_MS`, including empty values and values containing spaces; it runs in the `docker-build` CI job, so entrypoint changes are no longer merged unexecuted

### Changed

- CI now pins `actions/checkout@v5` and `actions/setup-java@v5` in both `.github/workflows/build.yml` and `.github/workflows/release.yml`, replacing the `v4` pins that GitHub has deprecated along with the Node.js 20 runtime they target

### Fixed

- Documentation accuracy: the `java -jar` examples in `README.md`, `USER_GUIDE.md` and `CONFIG.md` now name `target/gh-backup-2.0.0-SNAPSHOT-8-8-2026.jar`, the artifact the build actually produces, instead of the non-existent `target/gh-backup-1.0.0.jar`
- The `Build` workflow no longer triggers on a `develop` branch, and `.github/copilot-instructions.md` no longer instructs contributors to branch from and open pull requests against `develop`; the repository has only ever had `main`, and `CONTRIBUTING.md` was corrected to match in an earlier change
- `.github/copilot-instructions.md` now lists `application-daemon.properties` among the files under `src/main/resources/`, alongside `application.properties` and `application-web.properties`

## [2.0.0-SNAPSHOT-8-8-2026] – 2026-08-08

Expand Down
Loading