Skip to content

Commit ae39270

Browse files
authored
Merge pull request #110 from VCTLabs/agnostic-dist
release cleanup and dev tool updates
2 parents 1f657ec + f961e41 commit ae39270

7 files changed

Lines changed: 44 additions & 38 deletions

File tree

.github/workflows/release.yml

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -91,38 +91,22 @@ jobs:
9191

9292
create_release:
9393
name: Create Release
94-
needs: [packaging]
94+
needs: [packaging, get_version]
9595
runs-on: ubuntu-22.04
9696
permissions:
9797
contents: write
9898

9999
steps:
100-
- name: Get version
101-
id: get_version
102-
run: |
103-
echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
104-
echo ${{ env.VERSION }}
105-
106100
- uses: actions/checkout@v6
107101
with:
108102
fetch-depth: 0
109103

110-
- name: Set up Python ${{ matrix.python-version }}
111-
uses: actions/setup-python@v6
112-
with:
113-
python-version: 3.9
114-
115-
- name: Install dependencies
116-
run: |
117-
sudo apt-get install -yqq redis-server autoconf automake
118-
sudo apt-get install -yqq libjson-c-dev libhiredis-dev libgtest-dev libgmock-dev
119-
sudo systemctl stop redis
120-
python -m pip install --upgrade pip wheel
121-
pip install tox
122-
123-
- name: Build dist pkg
104+
- name: Check github variables
105+
env:
106+
VERSION: ${{ needs.get_version.outputs.version }}
124107
run: |
125-
tox -e dist
108+
echo "Package version from git: ${VERSION}"
109+
git archive --format=tar.gz -o redis-ipc-$VERSION.tar.gz --prefix=redis-ipc-$VERSION/ v${VERSION}
126110
127111
# download all artifacts to named path
128112
- uses: actions/download-artifact@v8
@@ -136,13 +120,13 @@ jobs:
136120
ls -l packages/
137121
138122
- name: Generate changes file
139-
uses: sarnold/gitchangelog-action@master
123+
uses: sarnold/gitchangelog-action@915234f151ceffb7a8c4f76de77e4ae321087b8f # v1.1.1
140124
with:
141125
github_token: ${{ secrets.GITHUB_TOKEN}}
142126

143127
- name: Create draft release
144128
id: create_release
145-
uses: softprops/action-gh-release@v3
129+
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
146130
env:
147131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
148132
with:

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ venv/
3434
ENV/
3535
env.bak/
3636
venv.bak/
37-
37+
# dist files
38+
*.tar.gz
39+
*.tar.xz
40+
*.deb
3841
# coverage files
3942
test/*.out
4043
*.gcov
44+
4145
# compilation files
4246
*.lo
4347
*.od

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
- id: check-useless-excludes
1111
- id: check-hooks-apply
1212
- repo: https://github.com/pre-commit/pre-commit-hooks
13-
rev: v4.4.0
13+
rev: v6.0.0
1414
hooks:
1515
- id: trailing-whitespace
1616
- id: end-of-file-fixer
@@ -30,7 +30,7 @@ repos:
3030
exclude: 'conda/meta.yaml'
3131

3232
- repo: https://github.com/PyCQA/doc8
33-
rev: v1.1.1
33+
rev: v2.0.0
3434
hooks:
3535
- id: doc8
3636
args:
@@ -53,12 +53,12 @@ repos:
5353
# exclude: 'conda/meta.yaml'
5454

5555
- repo: https://github.com/iconmaster5326/cmake-format-pre-commit-hook
56-
rev: v0.6.9
56+
rev: v0.6.13
5757
hooks:
5858
- id: cmake-format
5959

6060
- repo: https://github.com/lovesegfault/beautysh
61-
rev: v6.2.1
61+
rev: v6.4.3
6262
hooks:
6363
- id: beautysh
6464

@@ -70,7 +70,7 @@ repos:
7070

7171
# current cpplint hook ignores top-level CPPLINT.cfg
7272
- repo: https://github.com/cpplint/cpplint
73-
rev: 1.6.1
73+
rev: 2.0.2
7474
hooks:
7575
- id: cpplint
7676
args:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.18)
44
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
55

66
# used for both library and pkgconfig file
7-
set(PACKAGE_VERSION 0.2.2)
7+
set(PACKAGE_VERSION 0.3.0)
88
set(LIBRARY_SOVERSION 0)
99

1010
if(SCM_VERSION_INFO)

ChangeLog.rst

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@ Changelog
22
=========
33

44

5+
v0.3.0 (2026-04-13)
6+
-------------------
7+
8+
New
9+
~~~
10+
- Add support for per-component 'active_state' [S. Lockwood-Childs]
11+
12+
Changes
13+
~~~~~~~
14+
- Update debian files from latest focal builds. [Stephen L Arnold]
15+
16+
Fixes
17+
~~~~~
18+
- Bump static versions, cleanup release workflow, update .gitignore.
19+
[Stephen L Arnold]
20+
21+
* avoid using make dist for release workflow until we can add
22+
dynamic versioning
23+
* update pre-commit hook versions, apply cmake-format updates
24+
25+
526
v0.2.2 (2025-12-05)
627
-------------------
728

@@ -640,7 +661,7 @@ Other
640661
[Stephen L Arnold]
641662

642663
* remove temp fix when upstream issue is fixed
643-
* limit metrics collection to src/ directory only
664+
* limit metrics collection to src/ directory only
644665
* adjust gcovr cmd root/path args, cleanup cruft
645666
- Updated coverity results from after cleanup commit. [S. Lockwood-
646667
Childs]

cmake/coverage.cmake

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ if(COVERAGE_BUILD)
1313
"Source coverage is enabled. TEXT=${COVERAGE_TEXT}, LCOV=${COVERAGE_LCOV}, HTML=${COVERAGE_HTML}"
1414
)
1515

16-
find_package(
17-
LLVM REQUIRED CONFIG
18-
HINTS ${LLVM_DIRECTORY}
19-
)
20-
#get_filename_component(LLVM_PREFIX "${LLVM_DIR}" DIRECTORY)
16+
find_package(LLVM REQUIRED CONFIG HINTS ${LLVM_DIRECTORY})
17+
# get_filename_component(LLVM_PREFIX "${LLVM_DIR}" DIRECTORY)
2118
message(STATUS "Using llvm directory: ${LLVM_DIRECTORY}")
2219

2320
find_program(

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.68])
5-
AC_INIT([redis-ipc], [0.2.2], [sjl@vctlabs.com])
5+
AC_INIT([redis-ipc], [0.3.0], [sjl@vctlabs.com])
66
AC_CONFIG_SRCDIR([src/redis_ipc.c])
77
AC_CONFIG_MACRO_DIR([m4])
88
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

0 commit comments

Comments
 (0)