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
18 changes: 4 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,14 @@ jobs:
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Extract Docker Tag
- name: Extract Versions
shell: bash
run: |
tag=$(git describe --tags --abbrev=0)
tag2="${tag:1}"
short=$(git rev-parse --short HEAD)
final="${tag2}-${short}"
echo "git_tag=${final}" >> $GITHUB_ENV
- name: Extract Artifacts Version
shell: bash
run: |
tag=$(git describe --tags --abbrev=0)
short=$(git rev-parse --short HEAD)
final="${tag}-${short}"
echo "artifacts_version=${final}" >> $GITHUB_ENV
echo "info_version=${tag:1}" >> $GITHUB_ENV
echo "artifacts_version=${tag}-${short}" >> $GITHUB_ENV
echo "info_version=${tag:1}-${short}" >> $GITHUB_ENV
outputs:
git_tag: ${{ env.git_tag }}
artifacts_version: ${{ env.artifacts_version }}
info_version: ${{ env.info_version }}

Expand Down Expand Up @@ -57,7 +47,7 @@ jobs:
needs: calculate_version
with:
base_version: develop
info_version: ${{ needs.calculate_version.outputs.git_tag }}
info_version: ${{ needs.calculate_version.outputs.info_version }}
tag_version: ${{ github.sha }}
secrets:
docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
Expand Down
2 changes: 2 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ RUN cargo chef prepare --recipe-path recipe.json
FROM chef AS build
COPY --from=planner /build/recipe.json recipe.json
RUN cargo chef cook --release --recipe-path recipe.json
ARG INFO_VERSION
ENV ETV_VERSION=${INFO_VERSION}
COPY . .
RUN cargo build --release

Expand Down
Loading