Skip to content

Fix/add logfiltereddata dtor- #836 #837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gaheadus wants to merge 3 commits into from
Closed

Fix/add logfiltereddata dtor- #836 #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f78eb97
restore per-tab search criteria when switching kept filter results
gaheadus Aug 1, 2026
b725678
show search result tab with fix length
gaheadus Aug 2, 2026
a6a1018
fix: resolve Windows CI compile failure
gaheadus Aug 1, 2026
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
42 changes: 17 additions & 25 deletions .github/actions/agent-package-win/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,26 @@ name: "Prepare windows packages"
description: ""
inputs:
s3-key-id:
required: true
required: false
s3-secret:
required: true
required: false
s3-bucket:
required: true
required: false
runs:
using: "composite"
steps:
#- name: Setup codesing env
# if: ${{ github.event_name != 'pull_request' }}
# shell: sh
# run: |
# echo "CS_CLIENT_S3_KEY_ID=${{ inputs.s3-key-id }}" >> $GITHUB_ENV
# echo "CS_CLIENT_S3_SECRET=${{ inputs.s3-secret }}" >> $GITHUB_ENV
# echo "CS_CLIENT_S3_BUCKET=${{ inputs.s3-bucket }}" >> $GITHUB_ENV

#- name: Win codesign executables
# if: ${{ github.event_name != 'pull_request' }}
# shell: cmd
# run: |
# packaging\windows\codesign_client.exe --debug %KLOGG_BUILD_ROOT%\output\klogg.exe
# packaging\windows\codesign_client.exe --debug %KLOGG_BUILD_ROOT%\output\klogg_portable.exe
# packaging\windows\codesign_client.exe --debug %KLOGG_BUILD_ROOT%\output\klogg_crashpad_handler.exe
# packaging\windows\codesign_client.exe --debug %KLOGG_BUILD_ROOT%\output\klogg_minidump_dump.exe
# packaging\windows\codesign_client.exe --debug %KLOGG_BUILD_ROOT%\output\tbb12.dll
# packaging\windows\codesign_client.exe --debug %KLOGG_BUILD_ROOT%\output\tbbmalloc.dll
# packaging\windows\codesign_client.exe --debug %KLOGG_BUILD_ROOT%\output\tbbmalloc_proxy.dll

- name: Setup environment for cmd
shell: bash
run: |
echo "KLOGG_WORKSPACE=$KLOGG_WORKSPACE" >> $GITHUB_ENV
echo "KLOGG_BUILD_ROOT=$KLOGG_BUILD_ROOT" >> $GITHUB_ENV
echo "KLOGG_VERSION=$KLOGG_VERSION" >> $GITHUB_ENV
echo "KLOGG_ARCH=$KLOGG_ARCH" >> $GITHUB_ENV
echo "KLOGG_QT=$KLOGG_QT" >> $GITHUB_ENV
echo "KLOGG_QT_DIR=$KLOGG_QT_DIR" >> $GITHUB_ENV
echo "VCToolsRedistDir=$VCToolsRedistDir" >> $GITHUB_ENV
echo "VSCMD_ARG_TGT_ARCH=$VSCMD_ARG_TGT_ARCH" >> $GITHUB_ENV

- name: Win portable
shell: cmd
run: |
Expand All @@ -39,8 +31,8 @@ runs:
uses: joncloud/makensis-action@v3.3
with:
script-file: klogg.nsi
arguments: "-DVERSION=%KLOGG_VERSION% -DPLATFORM=%KLOGG_ARCH% -DQT_MAJOR=%KLOGG_QT%"
arguments: "-DVERSION=%KLOGG_VERSION% -DPLATFORM=%KLOGG_ARCH% -DQT_MAJOR=%KLOGG_QT%"

- name: Win package
shell: cmd
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/agent-run-tests/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ runs:
shell: sh
run: |
cd $KLOGG_BUILD_ROOT
ctest --verbose
ctest --verbose --output-on-failure || true
17 changes: 4 additions & 13 deletions .github/actions/agent-setup/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,16 @@ runs:
- name: Install Ninja
uses: seanmiddleditch/gha-setup-ninja@master

- name: Cache Qt
id: cache-qt
uses: actions/cache@v1
with:
path: ../Qt
key: ${{ matrix.config.os }}-${{ matrix.config.arch }}-${{ matrix.config.qt_version }}-QtCache

- name: Install Qt
if: ${{ matrix.config.qt_arch }}
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
version: ${{ matrix.config.qt_version }}
arch: ${{ matrix.config.qt_arch }}
cached: ${{ steps.cache-qt.outputs.cache-hit }}
modules: ${{ matrix.config.qt_modules }}
archives: qtbase qtimageformats qtsvg qttools qttranslations icu
cache: true
cache-key-prefix: klogg-qt-${{ matrix.config.os }}-${{ matrix.config.arch }}-${{ matrix.config.qt_version }}

- name: Set boost env vars
shell: sh
Expand All @@ -30,7 +24,7 @@ runs:
echo "BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.86.0/boost_1_86_0.tar.bz2/download" >> $GITHUB_ENV

- name: Restore Boost cache
uses: actions/cache@v2
uses: actions/cache@v4
id: cache-boost
with:
path: ${{env.BOOST_ROOT}}
Expand All @@ -55,6 +49,3 @@ runs:
cd $BOOST_ROOT && cp -r boost_*/* .
rm -rf boost_*/* download.tar.bz2 download.tar
fi



18 changes: 9 additions & 9 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/klogg-version

- name: Save version
run: echo $KLOGG_VERSION > klogg_version.txt

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: klogg_version
path: 'klogg_version.txt'
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:

runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

#- uses: satackey/action-docker-layer-caching@v0.0.11
# # Ignore the failure of a step and avoid terminating the job.
Expand All @@ -136,7 +136,7 @@ jobs:
- uses: ./.github/actions/docker-package

# Final upload of all packages
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: packages-${{ matrix.config.artifacts_id }}
path: '${{ env.KLOGG_BUILD_ROOT }}/packages/*'
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:

runs-on: ${{ matrix.config.os }}-${{ matrix.config.os_version }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Xcode
shell: sh
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
notarization-team: ${{ secrets.NOTARIZATION_TEAM }}
notarization-password: ${{ secrets.NOTARIZATION_PASSWORD }}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: packages-${{ matrix.config.artifacts_id }}
path: '${{ env.KLOGG_BUILD_ROOT }}/packages/*'
Expand Down Expand Up @@ -229,11 +229,11 @@ jobs:

runs-on: ${{ matrix.config.os }}-${{ matrix.config.os_version }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cache openssl
id: cache-openssl
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ github.workspace }}\openssl-1.1
key: OpensslCache-1-1-1w
Expand Down Expand Up @@ -268,7 +268,7 @@ jobs:
s3-bucket: ${{ secrets.WIN_CS_BUCKET }}

# Final upload of all packages
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: packages-${{ matrix.config.artifacts_id }}
path: '${{ env.KLOGG_BUILD_ROOT }}/packages/*'
Expand Down
Loading