From 9d902d80f1047d819563fca9c5399655dfeec72c Mon Sep 17 00:00:00 2001 From: da3dsoul Date: Sat, 17 Feb 2024 16:42:36 -0500 Subject: [PATCH] Hopefully fix the commit date in manual docker build --- .github/workflows/docker-manual.yml | 6 +++++- Shoko.Server.sln | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-manual.yml b/.github/workflows/docker-manual.yml index 9291f911d..08c386c90 100644 --- a/.github/workflows/docker-manual.yml +++ b/.github/workflows/docker-manual.yml @@ -68,6 +68,10 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Retrieve Commit Date + run: | + echo "COMMIT_DATE=$(git log -1 --format="%aI")" >> $GITHUB_OUTPUT + # Disabled provenance for now, until it works with docker manifest create. # The manifest list produced by the new feature is incompatible with the # expected format used in the docker manifest create command. @@ -85,7 +89,7 @@ jobs: version=${{ github.event.inputs.version }} channel=${{ github.event.inputs.release }} commit=${{ github.sha }} - date=$(git log -1 --format="%aI") + date=${{ steps.version.outputs.COMMIT_DATE }} provenance: false docker-manual-push_manifest: diff --git a/Shoko.Server.sln b/Shoko.Server.sln index 955653385..a0a46b35b 100644 --- a/Shoko.Server.sln +++ b/Shoko.Server.sln @@ -31,7 +31,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{00DE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{700D0E2E-FF22-4810-8BC5-537207182EDF}" ProjectSection(SolutionItems) = preProject - .github\workflows\docker-daily.yml = .github\workflows\docker-daily.yml .github\workflows\docker-manual.yml = .github\workflows\docker-manual.yml .github\workflows\docker-release.yml = .github\workflows\docker-release.yml .github\workflows\plugin-nuget.yml = .github\workflows\plugin-nuget.yml @@ -39,6 +38,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{ .github\workflows\UploadArchive.ps1 = .github\workflows\UploadArchive.ps1 .github\workflows\build-daily.yml = .github\workflows\build-daily.yml .github\workflows\build-release.yml = .github\workflows\build-release.yml + .github\workflows\issue-no-response.yml = .github\workflows\issue-no-response.yml + .github\workflows\ReplaceAVD3URL.ps1 = .github\workflows\ReplaceAVD3URL.ps1 + .github\workflows\ReplaceSentryDSN.ps1 = .github\workflows\ReplaceSentryDSN.ps1 + .github\workflows\UploadRelease.ps1 = .github\workflows\UploadRelease.ps1 EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "x86", "x86", "{700D0E2E-FF22-4810-8BC5-537207182ECA}"