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
4 changes: 2 additions & 2 deletions .github/workflows/bundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
else
SHORT_SHA=${FULL_SHA::7}
BUILD_DATE=$(date +'%Y.%-m.%-d' 2>/dev/null || date +'%Y.%m.%d' | sed 's/\.0\([0-9]\)/.\1/g')
VERSION="${BUILD_DATE}-${SHORT_SHA}"
VERSION="${BUILD_DATE}-g${SHORT_SHA}"
fi
echo "Setting version to: $VERSION"
# Update Cargo.toml version
Expand All @@ -184,7 +184,7 @@ jobs:
} else {
$SHORT_SHA = $env:FULL_SHA.Substring(0, 7)
$BUILD_DATE = Get-Date -Format "yyyy.M.d"
$VERSION = "$BUILD_DATE-$SHORT_SHA"
$VERSION = "$BUILD_DATE-g$SHORT_SHA"
}
Write-Host "Setting version to: $VERSION"
# Update Cargo.toml version
Expand Down
46 changes: 23 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ COPY . .

ARG VERSION

RUN --mount=type=cache,target=/usr/local/cargo/registry \
RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
--mount=type=cache,target=/src/target,id=datum-connect-target-$TARGETARCH \
if [ -n "$VERSION" ]; then \
sed -i "s/^version = \".*\"/version = \"${VERSION#v}\"/" cli/Cargo.toml lib/Cargo.toml \
Expand Down
Loading
Loading