Skip to content

Commit

Permalink
Merge pull request #1026 from bratpiorka/rrudnick_umf_ver_workflow
Browse files Browse the repository at this point in the history
use the UMF version from git describe in tests, not the harcoded one
  • Loading branch information
lukaszstolarczuk authored Jan 8, 2025
2 parents 30fada6 + 0b4cbaa commit 00999df
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
18 changes: 16 additions & 2 deletions .github/workflows/reusable_basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ permissions:
contents: read

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

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

- name: Get UMF version
run: |
$version = (git describe --tags --abbrev=0 | Select-String -Pattern '\d+\.\d+\.\d+').Matches.Value
echo "UMF_VERSION=$version" >> $env:GITHUB_ENV
shell: pwsh

- name: Configure build
run: >
cmake
Expand Down Expand Up @@ -469,6 +478,11 @@ jobs:
- name: Install hwloc
run: brew install hwloc tbb automake

- name: Get UMF version
run: |
VERSION=$(git describe --tags --abbrev=0 | grep -Eo '\d+\.\d+\.\d+')
echo "UMF_VERSION=$VERSION" >> $GITHUB_ENV
- name: Configure build
run: >
cmake
Expand Down
1 change: 0 additions & 1 deletion RELEASE_STEPS.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ Do changes for a release:
- Update project's version in a few places:
- For major and minor releases: `UMF_VERSION_CURRENT` in `include/umf/base.h` (the API version)
- `release` variable in `docs/config/conf.py` (for docs)
- `UMF_VERSION` variable in `.github/workflows/reusable_basic.yml` (for installation test)
- For major releases update ABI version in `.map` and `.def` files
- These files are defined for all public libraries (`libumf` and `proxy_lib`, at the moment)
- Commit these changes and tag the release:
Expand Down

0 comments on commit 00999df

Please sign in to comment.