You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by sw...@apache.org on 2023/07/30 02:34:13 UTC
[logging-log4cxx] 01/01: Use CFString in OSX integration builds
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch separate_macos_ci
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit ba5aa28a73b7bd7e632d3649b4e0751ff01b2c44
Author: Stephen Webb <sw...@gmail.com>
AuthorDate: Sun Jul 30 12:33:52 2023 +1000
Use CFString in OSX integration builds
---
.../{log4cxx-posix.yml => log4cxx-macos.yml} | 30 +++-------------------
.../{log4cxx-posix.yml => log4cxx-ubuntu.yml} | 15 +++--------
2 files changed, 7 insertions(+), 38 deletions(-)
diff --git a/.github/workflows/log4cxx-posix.yml b/.github/workflows/log4cxx-macos.yml
similarity index 65%
copy from .github/workflows/log4cxx-posix.yml
copy to .github/workflows/log4cxx-macos.yml
index 752eae86..5f10ccff 100644
--- a/.github/workflows/log4cxx-posix.yml
+++ b/.github/workflows/log4cxx-macos.yml
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-name: log4cxx-posix
+name: log4cxx-osx
on: [push, pull_request]
@@ -24,24 +24,8 @@ jobs:
strategy:
fail-fast: false
matrix:
- name: [ubuntu20-gcc, ubuntu20-clang, ubuntu22-gcc, ubuntu22-clang, osx-11, osx-12]
+ name: [osx-11, osx-12]
include:
- - name: ubuntu20-gcc
- os: ubuntu-20.04
- cxx: g++
- cc: gcc
- - name: ubuntu20-clang
- os: ubuntu-20.04
- cxx: clang++
- cc: clang
- - name: ubuntu22-gcc
- os: ubuntu-22.04
- cxx: g++
- cc: gcc
- - name: ubuntu22-clang
- os: ubuntu-22.04
- cxx: clang++
- cc: clang
- name: osx-11
os: macos-11
cxx: clang++
@@ -56,18 +40,12 @@ jobs:
with:
path: main
- - name: 'Configure Dependencies - Ubuntu'
- if: startsWith( matrix.name,'ubuntu' )
- run: |
- sudo apt-get update
- sudo apt-get install -y libapr1-dev libaprutil1-dev libfmt-dev unixodbc-dev
-
- - name: 'run cmake - posix'
+ - name: 'configure and build'
run: |
cd main
mkdir build
cd build
- cmake -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DLOG4CXX_ENABLE_ODBC=on ..
+ cmake -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DLOG4CXX_ENABLE_ODBC=on -DLOG4CXX_CFSTRING=on ..
cmake --build .
- name: run unit tests
diff --git a/.github/workflows/log4cxx-posix.yml b/.github/workflows/log4cxx-ubuntu.yml
similarity index 86%
rename from .github/workflows/log4cxx-posix.yml
rename to .github/workflows/log4cxx-ubuntu.yml
index 752eae86..d032ebb6 100644
--- a/.github/workflows/log4cxx-posix.yml
+++ b/.github/workflows/log4cxx-ubuntu.yml
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-name: log4cxx-posix
+name: log4cxx-ubuntu
on: [push, pull_request]
@@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- name: [ubuntu20-gcc, ubuntu20-clang, ubuntu22-gcc, ubuntu22-clang, osx-11, osx-12]
+ name: [ubuntu20-gcc, ubuntu20-clang, ubuntu22-gcc, ubuntu22-clang]
include:
- name: ubuntu20-gcc
os: ubuntu-20.04
@@ -42,22 +42,13 @@ jobs:
os: ubuntu-22.04
cxx: clang++
cc: clang
- - name: osx-11
- os: macos-11
- cxx: clang++
- cc: clang
- - name: osx-12
- os: macos-12
- cxx: clang++
- cc: clang
steps:
- uses: actions/checkout@v3
with:
path: main
- - name: 'Configure Dependencies - Ubuntu'
- if: startsWith( matrix.name,'ubuntu' )
+ - name: 'Configure Dependencies'
run: |
sudo apt-get update
sudo apt-get install -y libapr1-dev libaprutil1-dev libfmt-dev unixodbc-dev