Merge pull request 'fix: use git rev-parse for short SHA in build-dev' (#8) from fix/ci-short-sha into dev
Reviewed-on: #8
This commit was merged in pull request #8.
This commit is contained in:
@@ -40,7 +40,7 @@ jobs:
|
|||||||
password: ${{ secrets.TOKEN }}
|
password: ${{ secrets.TOKEN }}
|
||||||
|
|
||||||
- name: Compute short SHA
|
- name: Compute short SHA
|
||||||
run: echo "SHORT_SHA=${GITEA_SHA::7}" >> $GITEA_ENV
|
run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITEA_ENV
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
|
|||||||
@@ -156,4 +156,11 @@ describe('CI workflow regressions', () => {
|
|||||||
// BUILD_VERSION was never passed to docker build.
|
// BUILD_VERSION was never passed to docker build.
|
||||||
expect(ciYml).toContain('BUILD_VERSION')
|
expect(ciYml).toContain('BUILD_VERSION')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('short SHA is computed with git rev-parse, not $GITEA_SHA (which is empty)', () => {
|
||||||
|
// Regression: ${GITEA_SHA::7} expands to "" on Gitea runners — nav showed "dev-".
|
||||||
|
// git rev-parse --short HEAD works regardless of which env vars the runner sets.
|
||||||
|
expect(ciYml).toContain('git rev-parse --short HEAD')
|
||||||
|
expect(ciYml).not.toContain('GITEA_SHA')
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user