Skip to content

Commit 00999df

Browse files
Merge pull request #1026 from bratpiorka/rrudnick_umf_ver_workflow
use the UMF version from git describe in tests, not the harcoded one
2 parents 30fada6 + 0b4cbaa commit 00999df

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

.github/workflows/reusable_basic.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ permissions:
77
contents: read
88

99
env:
10-
# for installation testing - it should match with version set in git
11-
UMF_VERSION: 0.11.0
1210
BUILD_DIR : "${{github.workspace}}/build"
1311
INSTL_DIR : "${{github.workspace}}/../install-dir"
1412
COVERAGE_DIR : "${{github.workspace}}/coverage"
@@ -150,6 +148,11 @@ jobs:
150148
- name: Set ptrace value for IPC test
151149
run: sudo bash -c "echo 0 > /proc/sys/kernel/yama/ptrace_scope"
152150

151+
- name: Get UMF version
152+
run: |
153+
VERSION=$(git describe --tags --abbrev=0 | grep -oP '\d+\.\d+\.\d+')
154+
echo "UMF_VERSION=$VERSION" >> $GITHUB_ENV
155+
153156
- name: Configure build
154157
run: >
155158
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh &&' || ''}}
@@ -266,6 +269,12 @@ jobs:
266269
run: vcpkg install
267270
shell: pwsh # Specifies PowerShell as the shell for running the script.
268271

272+
- name: Get UMF version
273+
run: |
274+
$version = (git describe --tags --abbrev=0 | Select-String -Pattern '\d+\.\d+\.\d+').Matches.Value
275+
echo "UMF_VERSION=$version" >> $env:GITHUB_ENV
276+
shell: pwsh
277+
269278
- name: Configure build
270279
run: >
271280
cmake
@@ -469,6 +478,11 @@ jobs:
469478
- name: Install hwloc
470479
run: brew install hwloc tbb automake
471480

481+
- name: Get UMF version
482+
run: |
483+
VERSION=$(git describe --tags --abbrev=0 | grep -Eo '\d+\.\d+\.\d+')
484+
echo "UMF_VERSION=$VERSION" >> $GITHUB_ENV
485+
472486
- name: Configure build
473487
run: >
474488
cmake

RELEASE_STEPS.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ Do changes for a release:
4242
- Update project's version in a few places:
4343
- For major and minor releases: `UMF_VERSION_CURRENT` in `include/umf/base.h` (the API version)
4444
- `release` variable in `docs/config/conf.py` (for docs)
45-
- `UMF_VERSION` variable in `.github/workflows/reusable_basic.yml` (for installation test)
4645
- For major releases update ABI version in `.map` and `.def` files
4746
- These files are defined for all public libraries (`libumf` and `proxy_lib`, at the moment)
4847
- Commit these changes and tag the release:

0 commit comments

Comments
 (0)