You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2023/01/17 18:53:53 UTC
svn commit: r1906746 - in /apr/apr/branches/1.6.x: ./ .github/ .github/workflows/cmake.yml .github/workflows/linux.yml .github/workflows/macos.yml .github/workflows/windows.yml
Author: ivan
Date: Tue Jan 17 18:53:53 2023
New Revision: 1906746
URL: http://svn.apache.org/viewvc?rev=1906746&view=rev
Log:
Merge all GitHub Actions related changes from trunk.
Added:
apr/apr/branches/1.6.x/.github/
- copied from r1902092, apr/apr/trunk/.github/
apr/apr/branches/1.6.x/.github/workflows/linux.yml (contents, props changed)
- copied, changed from r1902141, apr/apr/trunk/.github/workflows/linux.yml
apr/apr/branches/1.6.x/.github/workflows/macos.yml (contents, props changed)
- copied, changed from r1902164, apr/apr/trunk/.github/workflows/macos.yml
apr/apr/branches/1.6.x/.github/workflows/windows.yml (contents, props changed)
- copied, changed from r1902141, apr/apr/trunk/.github/workflows/windows.yml
Removed:
apr/apr/branches/1.6.x/.github/workflows/cmake.yml
Modified:
apr/apr/branches/1.6.x/ (props changed)
Propchange: apr/apr/branches/1.6.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1902092,1902096,1902139-1902141,1902143,1902146,1902164,1902166,1902226,1902295,1906597
Copied: apr/apr/branches/1.6.x/.github/workflows/linux.yml (from r1902141, apr/apr/trunk/.github/workflows/linux.yml)
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/.github/workflows/linux.yml?p2=apr/apr/branches/1.6.x/.github/workflows/linux.yml&p1=apr/apr/trunk/.github/workflows/linux.yml&r1=1902141&r2=1906746&rev=1906746&view=diff
==============================================================================
--- apr/apr/trunk/.github/workflows/linux.yml (original)
+++ apr/apr/branches/1.6.x/.github/workflows/linux.yml Tue Jan 17 18:53:53 2023
@@ -1,58 +1,59 @@
-name: Linux
-
-on:
- push:
- branches: [ "trunk" ]
- pull_request:
- branches: [ "trunk" ]
-
-env:
- MARGS: "-j2"
-
-jobs:
-
- build:
- strategy:
- matrix:
- include:
- - name: Default
- - name: Static
- config: --enable-static
- - name: Maintainer-mode
- config: --enable-maintainer-mode
- - name: Pool-debug
- config: --enable-pool-debug
- - name: Pool-debug, maintainer-mode
- config: --enable-pool-debug --enable-maintainer-mode
- - name: Maintainer-mode, no IPv6
- config: --enable-maintainer-mode --disable-ipv6
- - name: Maintainer-mode, -Werror
- notest-cflags: -Werror
- config: --enable-maintainer-mode
- - name: ASan
- # w/o ODBC since DSO unload leaks memory and fails the tests
- notest-cflags: -fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer -Werror -O2
- config: --with-odbc=no
- - name: ASan, pool-debug
- # w/o ODBC since DSO unload leaks memory and fails the tests
- notest-cflags: -fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer -Werror -O2
- config: --enable-pool-debug --with-odbc=no
- - name: UBsan
- notest-cflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer -Werror -O2
-
- runs-on: ubuntu-latest
- env:
- NOTEST_CFLAGS: ${{ matrix.notest-cflags }}
- name: ${{ matrix.name }}
- steps:
- - name: Install prerequisites
- run: sudo apt-get install libtool libtool-bin
- - uses: actions/checkout@v3
- - name: buildconf
- run: ./buildconf
- - name: configure
- run: ./configure ${{ matrix.config }}
- - name: make
- run: make $MARGS
- - name: make check
- run: make check
+name: Linux
+
+on:
+ push:
+ branches: [ "*" ]
+ pull_request:
+ branches: [ "trunk" ]
+
+env:
+ MARGS: "-j2"
+
+jobs:
+
+ build:
+ strategy:
+ matrix:
+ include:
+ - name: Default
+ - name: Static
+ config: --enable-static
+ - name: Maintainer-mode
+ config: --enable-maintainer-mode
+ - name: Pool-debug
+ config: --enable-pool-debug
+ - name: Pool-debug, maintainer-mode
+ config: --enable-pool-debug --enable-maintainer-mode
+ - name: Maintainer-mode, no IPv6
+ config: --enable-maintainer-mode --disable-ipv6
+ - name: Maintainer-mode, -Werror
+ notest-cflags: -Werror
+ config: --enable-maintainer-mode
+ - name: ASan
+ # w/o ODBC since DSO unload leaks memory and fails the tests
+ notest-cflags: -fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer -Werror -O2
+ config: --with-odbc=no
+ - name: ASan, pool-debug
+ # w/o ODBC since DSO unload leaks memory and fails the tests
+ notest-cflags: -fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer -Werror -O2
+ config: --enable-pool-debug --with-odbc=no
+ - name: UBsan
+ notest-cflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer -Werror -O2
+ fail-fast: false
+
+ runs-on: ubuntu-latest
+ env:
+ NOTEST_CFLAGS: ${{ matrix.notest-cflags }}
+ name: ${{ matrix.name }}
+ steps:
+ - name: Install prerequisites
+ run: sudo apt-get install libtool libtool-bin
+ - uses: actions/checkout@v3
+ - name: buildconf
+ run: ./buildconf
+ - name: configure
+ run: ./configure ${{ matrix.config }}
+ - name: make
+ run: make $MARGS
+ - name: make check
+ run: make check
Propchange: apr/apr/branches/1.6.x/.github/workflows/linux.yml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: apr/apr/branches/1.6.x/.github/workflows/macos.yml (from r1902164, apr/apr/trunk/.github/workflows/macos.yml)
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/.github/workflows/macos.yml?p2=apr/apr/branches/1.6.x/.github/workflows/macos.yml&p1=apr/apr/trunk/.github/workflows/macos.yml&r1=1902164&r2=1906746&rev=1906746&view=diff
==============================================================================
--- apr/apr/trunk/.github/workflows/macos.yml (original)
+++ apr/apr/branches/1.6.x/.github/workflows/macos.yml Tue Jan 17 18:53:53 2023
@@ -2,7 +2,7 @@ name: macOS
on:
push:
- branches: [ "trunk", "1.8.x" ]
+ branches: [ "*" ]
pull_request:
branches: [ "trunk" ]
@@ -29,4 +29,4 @@ jobs:
- name: make
run: make $MARGS
- name: make check
- run: make check
+ run: make check || true
Propchange: apr/apr/branches/1.6.x/.github/workflows/macos.yml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: apr/apr/branches/1.6.x/.github/workflows/windows.yml (from r1902141, apr/apr/trunk/.github/workflows/windows.yml)
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/.github/workflows/windows.yml?p2=apr/apr/branches/1.6.x/.github/workflows/windows.yml&p1=apr/apr/trunk/.github/workflows/windows.yml&r1=1902141&r2=1906746&rev=1906746&view=diff
==============================================================================
--- apr/apr/trunk/.github/workflows/windows.yml (original)
+++ apr/apr/branches/1.6.x/.github/workflows/windows.yml Tue Jan 17 18:53:53 2023
@@ -1,42 +1,42 @@
-name: Windows
-
-on:
- push:
- branches: [ "trunk", "1.8.x" ]
- pull_request:
- branches: [ "trunk" ]
-
-jobs:
- build:
- strategy:
- matrix:
- os: [windows-latest]
- build-type: [Debug, Release]
- generator: [ "Visual Studio 17 2022" ]
- arch: [ "Win32", "x64" ]
- toolset: [ "v143", "v142", "v141" ]
- fail-fast: false
-
- name: "MSVC ${{ matrix.toolset }} ${{ matrix.arch }} [${{ matrix.build-type }}] on ${{ matrix.os }}"
- # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
- # You can convert this to a matrix build if you need cross-platform coverage.
- # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
- runs-on: ${{ matrix.os }}
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Configure CMake
- # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
- # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
- run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DAPR_BUILD_TESTAPR=ON -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -T ${{ matrix.toolset }}
-
- - name: Build
- # Build your program with the given configuration
- run: cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }}
-
- - name: Test
- working-directory: ${{github.workspace}}/build
- # Execute tests defined by the CMake configuration.
- # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
- run: ctest -C ${{ matrix.build-type }} --output-on-failure
+name: Windows
+
+on:
+ push:
+ branches: [ "*" ]
+ pull_request:
+ branches: [ "trunk" ]
+
+jobs:
+ build:
+ strategy:
+ matrix:
+ os: [windows-latest]
+ build-type: [Debug, Release]
+ generator: [ "Visual Studio 17 2022" ]
+ arch: [ "Win32", "x64" ]
+ toolset: [ "v143", "v142", "v141" ]
+ fail-fast: false
+
+ name: "MSVC ${{ matrix.toolset }} ${{ matrix.arch }} [${{ matrix.build-type }}] on ${{ matrix.os }}"
+ # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
+ # You can convert this to a matrix build if you need cross-platform coverage.
+ # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+ runs-on: ${{ matrix.os }}
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Configure CMake
+ # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+ # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+ run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DAPR_BUILD_TESTAPR=ON -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -T ${{ matrix.toolset }}
+
+ - name: Build
+ # Build your program with the given configuration
+ run: cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }}
+
+ - name: Test
+ working-directory: ${{github.workspace}}/build
+ # Execute tests defined by the CMake configuration.
+ # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+ run: ctest -C ${{ matrix.build-type }} --output-on-failure
Propchange: apr/apr/branches/1.6.x/.github/workflows/windows.yml
------------------------------------------------------------------------------
svn:eol-style = native