mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-10-23 17:01:22 +02:00
Code Issues Projects Releases Wiki Activity

Use a consistent short SHA length.

Browse Source
This commit is contained in:
supahgreg 2025-10-16 19:30:15 +00:00
parent b2b835ac0d
commit e2fce86d40
No known key found for this signature in database
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/publish.yml vendored
View File

@ -63,7 +63,7 @@ jobs:
run: echo "COMMIT_TIMESTAMP=$(git show -s --format=%ci HEAD)" >> $GITHUB_ENV
- name: Get commit short SHA
run: echo "COMMIT_SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
run: echo "COMMIT_SHORT_SHA=$(git rev-parse --abbrev=8 --short HEAD)" >> $GITHUB_ENV
- name: Log in to GitHub Container Registry
uses: docker/login-action@v3
@ -137,8 +137,7 @@ jobs:
- name: Generate version.json
run: |
# Get the commit short SHA (8 characters) expected by the backend
# TODO: switch to the full SHA everywhere
COMMIT_SHORT_SHA=$(git rev-parse --short HEAD)
COMMIT_SHORT_SHA=$(git rev-parse --abbrev=8 --short HEAD)
# Get the commit timestamp in Unix format
COMMIT_TIMESTAMP=$(git show -s --format=%ct HEAD)

2
classes/Config.php
View File

@ -406,7 +406,7 @@ class Config {
"timestamp" => 0,
];
$proc = proc_open("git --no-pager log --pretty=\"version-%ct-%h\" -n1 HEAD",
$proc = proc_open('git --no-pager log --pretty="version-%ct-%h" --abbrev=8 -n1 HEAD',
$descriptorspec, $pipes, $dir);
if (is_resource($proc)) {