Compare commits

...

4 Commits

Author SHA1 Message Date
Lars-Peter Clausen 4fd5291632 ci: Windows: Add gperf to dependency list
msys2 removed the gperf package from the base-devel package collection[1].

Add gperf explicitly to the dependency list, without this the Windows
CI will fail.

[1] 085698dce3

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2022-12-26 21:23:55 -05:00
Stephen Williams ba370285f3 ci: Windows: Replace `MINGW_INSTALLS` with `MINGW_ARCH`
Currently the Windows build generates a warning

   => WARNING: MINGW_INSTALLS is deprecated, use MINGW_ARCH instead

Make this change to the CI workflow file.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2022-12-26 21:22:21 -05:00
Stephen Williams 8ecb1ab15c v12: Pushes to v12-branch trigger actions 2022-12-26 13:04:33 -05:00
Stephen Williams ce20e9f769 v12: Start the v132 Stable branch 2022-12-26 12:44:58 -05:00
3 changed files with 6 additions and 4 deletions

View File

@ -1,10 +1,11 @@
name: test name: test
on: on:
# Every push onto the main branch triggers a retest. # Every push onto the main branch and releases triggers a retest.
push: push:
branches: branches:
- master - master
- v12-branch
# All pull_requests trigger a retest. # All pull_requests trigger a retest.
pull_request: pull_request:
@ -83,7 +84,7 @@ jobs:
run: run:
shell: msys2 {0} shell: msys2 {0}
env: env:
MINGW_INSTALLS: ${{ matrix.msystem }} MINGW_ARCH: ${{ matrix.msystem }}
steps: steps:
- run: git config --global core.autocrlf input - run: git config --global core.autocrlf input
@ -98,6 +99,7 @@ jobs:
install: > install: >
git git
base-devel base-devel
gperf
mingw-w64-${{ matrix.arch }}-toolchain mingw-w64-${{ matrix.arch }}-toolchain
- name: Build and check - name: Build and check

View File

@ -1,6 +1,6 @@
#norootforbuild #norootforbuild
# #
%define rev_date 20201003 %define rev_date 20221226
# Normally, the suff-ix is %nil, meaning the suffix is to not be used. # Normally, the suff-ix is %nil, meaning the suffix is to not be used.
# But if the builder wants to make a suffixed package, he may set this # But if the builder wants to make a suffixed package, he may set this
# to a value (i.e. -test) to cause suffixes to be put in all the right # to a value (i.e. -test) to cause suffixes to be put in all the right

View File

@ -10,7 +10,7 @@
* This will be appended to the version. Use this to mark development * This will be appended to the version. Use this to mark development
* versions and the like. * versions and the like.
*/ */
# define VERSION_EXTRA " (devel)" # define VERSION_EXTRA " (stable)"
# define VERSION_STRINGIFY(x) #x # define VERSION_STRINGIFY(x) #x
# define VERSION_STR(a,b,extra) VERSION_STRINGIFY(a.b) extra # define VERSION_STR(a,b,extra) VERSION_STRINGIFY(a.b) extra