Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into dfa-search
Browse files Browse the repository at this point in the history
  • Loading branch information
SharafMohamed committed Aug 2, 2024
2 parents a360cd8 + f38eee9 commit 71c6b23
Show file tree
Hide file tree
Showing 203 changed files with 31,653 additions and 3,029 deletions.
13 changes: 9 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# References
<!-- Any issues or pull requests relevant to this pull request -->
<!--
Set the PR title to a meaningful commit message in imperative form. E.g.:
clp-s: Don't add implicit wildcards ('*') at the beginning and the end of a query (fixes #390).
-->

# Description
<!-- Describe what this request will change/fix and provide any details necessary for reviewers -->
<!-- Describe what this request will change/fix and provide any details necessary for reviewers. -->



# Validation performed
<!-- What tests and validation you performed on the change -->
<!-- Describe what tests and validation you performed on the change. -->

2 changes: 1 addition & 1 deletion .github/workflows/clp-core-build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
build-macos:
runs-on: "macos-12"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/clp-core-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
ubuntu_jammy_image_changed: "${{steps.filter.outputs.ubuntu_jammy_image}}"
clp_changed: "${{steps.filter.outputs.clp}}"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand All @@ -44,7 +44,7 @@ jobs:
shell: "bash"

- name: "Filter relevant changes"
uses: "dorny/paths-filter@v2"
uses: "dorny/paths-filter@v3"
id: "filter"
with:
# Consider changes between the current commit and `main`
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
needs: "filter-relevant-changes"
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand All @@ -116,7 +116,7 @@ jobs:
needs: "filter-relevant-changes"
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand All @@ -141,7 +141,7 @@ jobs:
needs: "filter-relevant-changes"
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
- "filter-relevant-changes"
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
- "ubuntu-focal-deps-image"
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
- "ubuntu-jammy-deps-image"
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
OS_NAME: "ubuntu-focal"
TMP_OUTPUT_DIR: "/tmp"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/clp-docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: "clp-docs"

on:
pull_request:
push:
workflow_dispatch:

concurrency:
group: "${{github.workflow}}-${{github.ref}}"
# Cancel in-progress jobs for efficiency
cancel-in-progress: true

jobs:
build:
strategy:
matrix:
os: ["macos-latest", "ubuntu-latest"]
runs-on: "${{matrix.os}}"
steps:
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

- uses: "actions/setup-python@v5"
with:
python-version: "3.10"

- name: "Install task"
shell: "bash"
run: "npm install -g @go-task/cli"

- if: "matrix.os == 'macos-latest'"
name: "Install coreutils (for md5sum)"
run: "brew install coreutils"

- name: "Build docs"
shell: "bash"
run: "task docs:site"
8 changes: 4 additions & 4 deletions .github/workflows/clp-execution-image-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
ubuntu_focal_image_changed: "${{steps.filter.outputs.ubuntu_focal_image}}"
ubuntu_jammy_image_changed: "${{steps.filter.outputs.ubuntu_jammy_image}}"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand All @@ -34,7 +34,7 @@ jobs:
shell: "bash"

- name: "Filter relevant changes"
uses: "dorny/paths-filter@v2"
uses: "dorny/paths-filter@v3"
id: "filter"
with:
base: "main"
Expand All @@ -53,7 +53,7 @@ jobs:
needs: "filter-relevant-changes"
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand All @@ -74,7 +74,7 @@ jobs:
needs: "filter-relevant-changes"
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clp-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
os: ["macos-latest", "ubuntu-latest"]
runs-on: "${{matrix.os}}"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: "recursive"

Expand Down
12 changes: 9 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,18 @@
[submodule "components/core/submodules/log-surgeon"]
path = components/core/submodules/log-surgeon
url = https://github.com/y-scope/log-surgeon.git
[submodule "components/core/submodules/boost-outcome"]
path = components/core/submodules/boost-outcome
url = https://github.com/boostorg/outcome.git
[submodule "components/core/submodules/simdjson"]
path = components/core/submodules/simdjson
url = https://github.com/simdjson/simdjson.git
[submodule "components/core/submodules/abseil-cpp"]
path = components/core/submodules/abseil-cpp
url = https://github.com/abseil/abseil-cpp.git
[submodule "tools/yscope-dev-utils"]
path = tools/yscope-dev-utils
url = https://github.com/y-scope/yscope-dev-utils.git
[submodule "components/core/submodules/outcome"]
path = components/core/submodules/outcome
url = https://github.com/ned14/outcome.git
[submodule "components/log-viewer-webui/yscope-log-viewer"]
path = components/log-viewer-webui/yscope-log-viewer
url = https://github.com/y-scope/yscope-log-viewer.git
Loading

0 comments on commit 71c6b23

Please sign in to comment.