Skip to content

Commit

Permalink
Export version variables
Browse files Browse the repository at this point in the history
  • Loading branch information
Georgy Kirichenko authored and GeorgyKirichenko committed Sep 19, 2024
1 parent 7c177c7 commit bc540b7
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
25 changes: 23 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,28 @@ name: Release

on:
push:
branch:
- 'release/*'
tag:
- '*'

jobs:
version:
runs-on: ubuntu-latest
outputs:
major: ${{ steps.major.outputs.major }}
minor: ${{ steps.minor.outputs.minor }}
steps:
- id: major
run: echo "major=$([[ ${{github.ref_name}} =~ ([0-9]*) ]] && echo ${BASH_REMATCH[1]})" >> "$GITHUB_OUTPUT"
- id: minor
run: |
MINOR=$([[ ${{github.ref_name}} =~ [0-9]*.([0-9]*) ]] && echo ${BASH_REMATCH[1]})
SUBMINOR=$([[ ${{github.ref_name}} =~ [0-9]*.[0-9]*.([0-9]*) ]] && echo ${BASH_REMATCH[1]})
let "MINOR = 65536 * ${SUBMINOR} + ${MINOR}"
echo "minor=${MINOR}" >> "$GITHUB_OUTPUT"
build-debian-package-jammy:
name: build-image
runs-on: ubuntu-latest
needs: [version]
permissions:
packages: write
contents: read
Expand All @@ -34,6 +49,12 @@ jobs:
with:
context: .
file: ./build/Dockerfile.image
build-args: |
YANET_VERSION_MAJOR=${{needs.version.outputs.major}}
YANET_VERSION_MINOR=${{needs.version.outputs.minor}}
YANET_VERSION_REVISION=${{github.run_number}}
YANET_VERSION_HASH=${{github.sha}}
YANET_VERSION_CUSTOM=stable
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
1 change: 0 additions & 1 deletion build/Dockerfile.image
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

RUN python3 -m pip install meson==0.61.2


FROM environment AS builder

ARG YANET_VERSION_MAJOR=0
Expand Down
6 changes: 5 additions & 1 deletion common/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ inline std::string version_custom()
inline std::string version_to_string(const unsigned int major = YANET_VERSION_MAJOR,
const unsigned int minor = YANET_VERSION_MINOR)
{
std::string version(std::to_string(major) + "." + std::to_string(minor));
std::string version(std::to_string(major) + "." + std::to_string(minor & 0xffff));
if (minor & 0xffff0000)
{
version += "." + std::to_string(minor >> 16);
}
return version;
}

Expand Down

0 comments on commit bc540b7

Please sign in to comment.