Skip to content
Draft
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
File renamed without changes.
6 changes: 3 additions & 3 deletions CodeStyleFiles/pre-commit → .github/code-style/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -e
REPO_ROOT=$(git rev-parse --show-toplevel)

# Adjust path to clang-format config if needed
FORMAT_STYLE=file:"$REPO_ROOT/CodeStyleFiles/ChronoLog.clang-format"
FORMAT_STYLE=file:"$REPO_ROOT/.github/code-style/ChronoLog.clang-format"

# Resolve clang-format: search custom paths and PATH without modifying parent shell
CLANG_FORMAT_NAME="${CLANG_FORMAT:-clang-format-18}"
Expand Down Expand Up @@ -37,8 +37,8 @@ else
fi

# Check if the clang-format configuration file exists
if [ ! -f "$REPO_ROOT/CodeStyleFiles/ChronoLog.clang-format" ]; then
echo "Error: clang-format configuration file not found at $REPO_ROOT/CodeStyleFiles/ChronoLog.clang-format."
if [ ! -f "$REPO_ROOT/.github/code-style/ChronoLog.clang-format" ]; then
echo "Error: clang-format configuration file not found at $REPO_ROOT/.github/code-style/ChronoLog.clang-format."
exit 1
fi

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/check-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: "ChronoLog: Check Format"
# To format code locally, install clang-format-18 from default Ubuntu repositories:
# Ubuntu 24.04:
# sudo apt-get update && sudo apt-get install -y clang-format-18
# Then run: clang-format-18 -i -style=file:CodeStyleFiles/ChronoLog.clang-format <file>
# Then run: clang-format-18 -i -style=file:.github/code-style/ChronoLog.clang-format <file>

on:
pull_request:
Expand All @@ -15,7 +15,7 @@ on:
- '**/*.cc'
- '**/*.cxx'
- '**/*.c'
- 'CodeStyleFiles/ChronoLog.clang-format'
- '.github/code-style/ChronoLog.clang-format'
- '.github/workflows/clang-format-check.yml'
workflow_dispatch:

Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
echo "Checking: $file"

# Create formatted version
clang-format-18 -style=file:CodeStyleFiles/ChronoLog.clang-format "$file" > "/tmp/formatted/$(echo "$file" | sed 's|/|_|g')"
clang-format-18 -style=file:.github/code-style/ChronoLog.clang-format "$file" > "/tmp/formatted/$(echo "$file" | sed 's|/|_|g')"

# Compare with original
if ! diff -q "$file" "/tmp/formatted/$(echo "$file" | sed 's|/|_|g')" > /dev/null; then
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
echo "Generating patch for: $file"

# Create formatted version
clang-format-18 -style=file:CodeStyleFiles/ChronoLog.clang-format "$file" > "/tmp/formatted/$(echo "$file" | sed 's|/|_|g')"
clang-format-18 -style=file:.github/code-style/ChronoLog.clang-format "$file" > "/tmp/formatted/$(echo "$file" | sed 's|/|_|g')"

# Generate unified diff patch
patch_file="format_patches/$(echo "$file" | sed 's|/|_|g').patch"
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
commentBody += ` \`\`\`bash\n`;
commentBody += ` # Ensure you have clang-format-18 from Ubuntu 24.04 default repositories installed (required for consistent formatting)\n`;
issueFiles.forEach(file => {
commentBody += ` clang-format-18 -i -style=file:CodeStyleFiles/ChronoLog.clang-format ${file}\n`;
commentBody += ` clang-format-18 -i -style=file:.github/code-style/ChronoLog.clang-format ${file}\n`;
});
commentBody += ` \`\`\`\n\n`;
commentBody += `4. **Commit and push** the formatting changes\n\n`;
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Compute base image hash
id: basehash
run: |
echo "hash=${{ hashFiles('spack.yaml', 'Client/spack.yaml', '.github/docker/**') }}" >> $GITHUB_OUTPUT
echo "hash=${{ hashFiles('spack.yaml', 'client/spack.yaml', 'ci/docker/**') }}" >> $GITHUB_OUTPUT

- name: Set base image name
id: set-base-image-name
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
if: steps.pull-base.outputs.hit != 'true'
uses: docker/build-push-action@v4
with:
context: .github/docker
context: ci/docker
push: false
tags: ${{ steps.set-base-image-name.outputs.full-name }}
cache-from: type=gha
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [main]
paths:
- 'website/**'
- 'docs-website/**'
- 'docs/**'
workflow_dispatch:

permissions:
Expand Down Expand Up @@ -39,14 +39,14 @@ jobs:

- name: Install docs website dependencies
run: npm ci
working-directory: docs-website
working-directory: docs

- name: Build docs website
run: npm run build
working-directory: docs-website
working-directory: docs

- name: Merge docs into main website build
run: cp -r docs-website/build/. website/dist/docs/
run: cp -r docs/build/. website/dist/docs/

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Compute base image hash
id: basehash
run: |
echo "hash=${{ hashFiles('spack.yaml', 'Client/spack.yaml', '.github/docker/**') }}" >> $GITHUB_OUTPUT
echo "hash=${{ hashFiles('spack.yaml', 'client/spack.yaml', 'ci/docker/**') }}" >> $GITHUB_OUTPUT

- name: Set base image name (immutable)
id: set-base-image-name
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
id: build-base-docker-image
uses: docker/build-push-action@v4
with:
context: .github/docker
context: ci/docker
push: false
tags: ${{ steps.set-base-image-name.outputs.full-name }}
cache-from: type=gha
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-dev-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Compute base image hash
id: basehash
run: |
echo "hash=${{ hashFiles('spack.yaml', 'Client/spack.yaml', '.github/docker/**') }}" >> $GITHUB_OUTPUT
echo "hash=${{ hashFiles('spack.yaml', 'client/spack.yaml', 'ci/docker/**') }}" >> $GITHUB_OUTPUT

- name: Set base image name (immutable)
id: set-base-image-name
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
if: steps.pull-base.outputs.hit != 'true'
uses: docker/build-push-action@v4
with:
context: .github/docker
context: ci/docker
push: false
tags: ${{ steps.set-base-image-name.outputs.full-name }}
cache-from: type=gha
Expand Down
16 changes: 0 additions & 16 deletions .travis.yml

This file was deleted.

22 changes: 11 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ if(CHRONOLOG_ENABLE_DOXYGEN)
BUILD_DIR
${CMAKE_CURRENT_BINARY_DIR}/_build
DOXY_FILE
${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in
${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile.in
TARGET_NAME
dox
COMMENT
Expand All @@ -229,8 +229,8 @@ add_custom_target(lint COMMAND cpplint --recursive
--exclude=${CMAKE_CURRENT_SOURCE_DIR}/build
--exclude=${CMAKE_CURRENT_SOURCE_DIR}/cmake-build-debug
--exclude=${CMAKE_CURRENT_SOURCE_DIR}/external_libs
--exclude=${CMAKE_CURRENT_SOURCE_DIR}/doc
--exclude=${CMAKE_CURRENT_SOURCE_DIR}/CI
--exclude=${CMAKE_CURRENT_SOURCE_DIR}/docs
--exclude=${CMAKE_CURRENT_SOURCE_DIR}/ci
${CMAKE_CURRENT_SOURCE_DIR})

#------------------------------------------------------------------------------
Expand All @@ -249,19 +249,19 @@ endif()
#------------------------------------------------------------------------------
# ChronoLog Components
#------------------------------------------------------------------------------
add_subdirectory(chrono_common)
add_subdirectory(Client)
add_subdirectory(ChronoVisor)
add_subdirectory(ChronoKeeper)
add_subdirectory(ChronoGrapher)
add_subdirectory(ChronoPlayer)
add_subdirectory(src/chrono-common)
add_subdirectory(client)
add_subdirectory(src/chrono-visor)
add_subdirectory(src/chrono-keeper)
add_subdirectory(src/chrono-grapher)
add_subdirectory(src/chrono-player)
add_subdirectory(ChronoStore)
add_subdirectory(tools)
add_subdirectory(Plugins)
add_subdirectory(plugins)

if(CHRONOLOG_BUILD_TESTS_NOW)
enable_testing()
add_subdirectory(test)
add_subdirectory(tests)
endif()

#------------------------------------------------------------------------------
Expand Down
67 changes: 0 additions & 67 deletions ChronoKeeper/include/StoryIngestionHandle.h

This file was deleted.

49 changes: 0 additions & 49 deletions ChronoVisor/include/Event.h

This file was deleted.

Loading
Loading