Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
168 changes: 0 additions & 168 deletions .azure/azure-pipelines.ci.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .github/codeql/codeql-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
name: "CodeQL config"

queries:
- uses: security-extended # security-and-quality (very verbose)
31 changes: 31 additions & 0 deletions .github/workflows/check-clog-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: CLOG

on:
push:
branches:
- main
- release/*
pull_request:
branches:
- main
- release/*

jobs:
validate:
name: Validate(Linux)
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2

- run: |
sudo apt-add-repository ppa:lttng/stable-2.12
sudo apt-get update
sudo apt-get install -y liblttng-ust-dev lttng-tools build-essential

- name: Build CLOG and run Tests
run: ./runTests.ps1
working-directory: ./examples
shell: pwsh


25 changes: 25 additions & 0 deletions .github/workflows/check-clog-windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: CLOG

on:
push:
branches:
- main
- release/*

pull_request:
branches:
- main
- release/*

jobs:
validate:
name: Validate(Windows)
runs-on: windows-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Build CLOG and run Tests
run: ./runTests.ps1
working-directory: ./examples
shell: pwsh
50 changes: 50 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
name: "CodeQL"

on:
push:
branches:
- main
- release/*
pull_request:
# The branches below must be a subset of the branches above
branches:
- main
- release/*
schedule:
- cron: '0 17 * * 1'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 2
submodules: 'recursive'

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: cpp,csharp
config-file: ./.github/codeql/codeql-config.yml

# Build
- run: |
mkdir build
cd build
cmake ..
cmake --build .
cd ..
find

# Analyze this build.
- run: |
cd build
cmake --build .

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
29 changes: 18 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@ function(DOT_NET_BUILD)
set(DEPENDENCY_NAME ${ARGV0})
set(DEST_BINARY ${CLOG_ARTIFACT_DIR}/${ARGV1})
set(PROJECT_PATH ${ARGV2})
set(DOTNET_FRAMEWORK ${ARGV3})
list(REMOVE_AT ARGV 0)
list(REMOVE_AT ARGV 0)
list(REMOVE_AT ARGV 0)
list(REMOVE_AT ARGV 0)

#message(STATUS "---------------------- GENERATING : ${DEPENDENCY_NAME} -------------------")
#message(STATUS "PROJECT : ${PROJECT_PATH}")
#message(STATUS "PRODUCES : ${DEST_BINARY}")
#message(STATUS "DOTNET_RUNTIME : ${DOTNET_RUNTIME}")
#message(STATUS "OUTPUTDIR : ${CLOG_ARTIFACT_DIR}")
message(STATUS "---------------------- GENERATING : ${DEPENDENCY_NAME} -------------------")
message(STATUS "PROJECT : ${PROJECT_PATH}")
message(STATUS "PRODUCES : ${DEST_BINARY}")
message(STATUS "DOTNET_RUNTIME : ${DOTNET_RUNTIME}")
message(STATUS "OUTPUTDIR : ${CLOG_ARTIFACT_DIR}")
message(STATUS "DOTNET_FRAMEWORK : ${DOTNET_FRAMEWORK}")

foreach(arg IN LISTS ARGV)
#message(STATUS "FILE : ${CMAKE_CURRENT_BINARY_DIR}/${arg}")
Expand All @@ -32,7 +35,7 @@ function(DOT_NET_BUILD)
COMMENT
"build CLOG, if this fails with nuget packages inspect your nuget.config and make sure nuget.org is present (add from command line using : dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org)"
COMMAND
dotnet publish ${PROJECT_PATH} -o ${CLOG_ARTIFACT_DIR} -f net5.0
dotnet publish ${PROJECT_PATH} -o ${CLOG_ARTIFACT_DIR} -f ${DOTNET_FRAMEWORK}
DEPENDS
${PROJECT_PATH}
DEPENDS
Expand All @@ -47,14 +50,15 @@ function(DOT_NET_LIBRARY_BUILD)
set(DEPENDENCY_NAME ${ARGV0})
set(DEST_BINARY ${CLOG_ARTIFACT_DIR}/${DOTNET_RUNTIME}/${ARGV1})
set(PROJECT_PATH ${ARGV2})

list(REMOVE_AT ARGV 0)
list(REMOVE_AT ARGV 0)
list(REMOVE_AT ARGV 0)

#message(STATUS "---------------------- GENERATING : ${DEPENDENCY_NAME} -------------------")
#message(STATUS "PROJECT : ${PROJECT_PATH}")
#message(STATUS "PRODUCES : ${DEST_BINARY}")
#message(STATUS "OUTPUTDIR : ${CLOG_ARTIFACT_DIR}/${DOTNET_RUNTIME}")
##message(STATUS "---------------------- GENERATING : ${DEPENDENCY_NAME} -------------------")
##message(STATUS "PROJECT : ${PROJECT_PATH}")
##message(STATUS "PRODUCES : ${DEST_BINARY}")
##message(STATUS "OUTPUTDIR : ${CLOG_ARTIFACT_DIR}/${DOTNET_RUNTIME}")

foreach(arg IN LISTS ARGV)
#message(STATUS "FILE : ${CMAKE_CURRENT_BINARY_DIR}/${arg}")
Expand All @@ -81,6 +85,9 @@ add_subdirectory(src/clog)
add_subdirectory(src/clogutils)

if (NOT APPLE)
add_subdirectory(src/clog2text/clog2text_windows)
add_subdirectory(src/clog2text/clog2text_lttng)
endif()

if (WIN32)
add_subdirectory(src/clog2text/clog2text_windows)
endif()
22 changes: 20 additions & 2 deletions clog.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clog", "src\clog\clog.cspro
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clogutils", "src\clogutils\clogutils.csproj", "{076A3AA5-DEB6-45AB-B834-5416178BAF44}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clog2text", "src\clog2text", "{C05DAADF-AA11-4B93-A0B9-CCA2849A6A06}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clog2text", "clog2text", "{C05DAADF-AA11-4B93-A0B9-CCA2849A6A06}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clog2text_lttng", "src\clog2text\clog2text_lttng\clog2text_lttng.csproj", "{B683F6AC-DEC3-4AFC-B156-77F303EE2986}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clog2text_windows", "src\clog2text\clog2text_windows\clog2text_windows.csproj", "{1ACE842F-1CA7-49E8-8E43-2C33EAF7E170}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "decoderTest", "src\decoderTest\decoderTest.csproj", "{A2079B4E-FF96-4DE5-80E8-8403A17C4347}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "converters", "src\converters", "{FE0B277E-B292-4FF2-8C69-15EECC1A3787}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "converters", "converters", "{FE0B277E-B292-4FF2-8C69-15EECC1A3787}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "syslog2clog", "src\converters\syslog2clog\syslog2clog.csproj", "{E1FA7999-5C45-46B1-9E83-5467264F928E}"
EndProject
Expand Down Expand Up @@ -75,6 +75,22 @@ Global
{E1FA7999-5C45-46B1-9E83-5467264F928E}.Release|Any CPU.Build.0 = Release|Any CPU
{E1FA7999-5C45-46B1-9E83-5467264F928E}.Release|x64.ActiveCfg = Release|Any CPU
{E1FA7999-5C45-46B1-9E83-5467264F928E}.Release|x64.Build.0 = Release|Any CPU
{A8C76D37-6C7C-4617-8A05-7469C07E294D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A8C76D37-6C7C-4617-8A05-7469C07E294D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A8C76D37-6C7C-4617-8A05-7469C07E294D}.Debug|x64.ActiveCfg = Debug|Any CPU
{A8C76D37-6C7C-4617-8A05-7469C07E294D}.Debug|x64.Build.0 = Debug|Any CPU
{A8C76D37-6C7C-4617-8A05-7469C07E294D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A8C76D37-6C7C-4617-8A05-7469C07E294D}.Release|Any CPU.Build.0 = Release|Any CPU
{A8C76D37-6C7C-4617-8A05-7469C07E294D}.Release|x64.ActiveCfg = Release|Any CPU
{A8C76D37-6C7C-4617-8A05-7469C07E294D}.Release|x64.Build.0 = Release|Any CPU
{A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Debug|x64.ActiveCfg = Debug|Any CPU
{A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Debug|x64.Build.0 = Debug|Any CPU
{A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Release|Any CPU.Build.0 = Release|Any CPU
{A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Release|x64.ActiveCfg = Release|Any CPU
{A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -83,6 +99,8 @@ Global
{B683F6AC-DEC3-4AFC-B156-77F303EE2986} = {C05DAADF-AA11-4B93-A0B9-CCA2849A6A06}
{1ACE842F-1CA7-49E8-8E43-2C33EAF7E170} = {C05DAADF-AA11-4B93-A0B9-CCA2849A6A06}
{E1FA7999-5C45-46B1-9E83-5467264F928E} = {FE0B277E-B292-4FF2-8C69-15EECC1A3787}
{A8C76D37-6C7C-4617-8A05-7469C07E294D} = {FE0B277E-B292-4FF2-8C69-15EECC1A3787}
{A9D4DA06-7428-4639-BFD0-69D63CCD8F3E} = {C05DAADF-AA11-4B93-A0B9-CCA2849A6A06}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {923EC79F-9700-466D-8668-106D7BDECF0D}
Expand Down
Loading