Skip to content

Commit

Permalink
On the 'apply-processor' branch: Automatically merge the changes from…
Browse files Browse the repository at this point in the history
… the

'trunk' except revisions where merge.c file was modified; I'll merge them
separately.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/apply-processor@1922329 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
rinrab committed Dec 5, 2024
1 parent 009faab commit 7190b14
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/autoconf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# autoconf.yml -- Configuration for autoconf GitHub Action workflow.
#

name: Build and Test Subversion using autoconf build system
name: autoconf

on:
push:
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
run: make -j

- name: Run tests (make check)
run: make check
run: make check PARALLEL=16

- name: Install (make install)
run: sudo make install
5 changes: 3 additions & 2 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# cmake.yml -- Configuration for CMake GitHub Action workflow.
#

name: Build and Test Subversion with CMake
name: CMake

on:
push:
Expand Down Expand Up @@ -154,6 +154,7 @@ jobs:
-DSVN_ENABLE_RA_SERF=ON
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installdir
-DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}
-DSVN_TEST_CONFIGURE_FOR_PARALLEL=ON
${{ matrix.extra_config_opts }}
- name: Build CMake
Expand All @@ -166,7 +167,7 @@ jobs:
id: run_all_tests
if: matrix.run_tests
working-directory: out
run: ctest --output-on-failure --verbose -C Release
run: ctest --output-on-failure --verbose -C Release --parallel 16

- name: Rerun failed tests
if: ${{ matrix.run_tests && failure() && steps.run_all_tests.conclusion == 'failure' }}
Expand Down
11 changes: 11 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ https://svn.apache.org/repos/asf/subversion/tags/1.15.0
time with --disable-plaintext-password-storage. This reverts r1845377
(r1909351).

Version 1.14.5
(7 Dec 2024, from /branches/1.14.x)
https://svn.apache.org/repos/asf/subversion/tags/1.14.5
User-visible changes:
Developer-visible changes:
* Fix detection of zlib version 1.3 in gen-make.py on Windows (r1921266)
* Supress gen-make.py errors on Windows without Perl or Ruby (r1921267)
* Fix printf-format build warnings in swig-rb (r1921264)
* Add a regression test for CVE-2024-45720 (r1921266)
* Make swig-py compatible with SWIG 4.3.0 (r1921505)

Version 1.14.4
(8 Oct 2024, from /branches/1.14.x)
https://svn.apache.org/repos/asf/subversion/tags/1.14.4
Expand Down

0 comments on commit 7190b14

Please sign in to comment.