Skip to content
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
6dfabf6
Ort add enabledPackageManagers
prateek-kumar-improving Mar 31, 2025
869cefa
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 2, 2025
6ea6a5b
Go: Update Go package manager in ort.yml file
prateek-kumar-improving May 2, 2025
97a7d8d
Go: .ort.yml file added
prateek-kumar-improving May 2, 2025
b3e0872
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 5, 2025
4f29f20
Go: Update package manager
prateek-kumar-improving May 5, 2025
6fd19fc
Go: Add generate protobuf for go
prateek-kumar-improving May 5, 2025
1a11662
Go: Add generate protobuf for go
prateek-kumar-improving May 5, 2025
8310cdb
Go: Add generate protobuf for go
prateek-kumar-improving May 5, 2025
2f2a1eb
Go: Update ort.yml
prateek-kumar-improving May 5, 2025
84bc210
Go: Update ort.yml GO step
prateek-kumar-improving May 5, 2025
1c15eea
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 9, 2025
3672f50
result file output added
prateek-kumar-improving May 9, 2025
23754b2
update ort.yml
prateek-kumar-improving May 12, 2025
2f42d81
Update CHANGELOG.md
prateek-kumar-improving May 12, 2025
32fec86
update ort.yml
prateek-kumar-improving May 12, 2025
02013f6
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 14, 2025
aa3f264
Go: Install protobuf
prateek-kumar-improving May 14, 2025
4beded2
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 20, 2025
44ed86a
Go: update ort
prateek-kumar-improving May 22, 2025
ff728f6
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 22, 2025
de5e202
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 22, 2025
9ac29be
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 23, 2025
4fa3b3f
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 28, 2025
ad3d403
Add ORT for FFI
prateek-kumar-improving May 28, 2025
208a923
Add ORT for FFI
prateek-kumar-improving May 28, 2025
49cd90d
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 30, 2025
d8bbf3a
Go: Add .ort.yml for ffi
prateek-kumar-improving May 30, 2025
aa53474
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 30, 2025
ec9f006
Merge attributions
Yury-Fridlyand May 30, 2025
59bd536
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 30, 2025
27185e3
Merge branch 'main' into go/ort-update
prateek-kumar-improving May 31, 2025
ee55f3c
cleanup
Yury-Fridlyand May 31, 2025
e20aeac
exceptions
Yury-Fridlyand May 31, 2025
a7551e7
Merge branch 'main' into go/ort-update
avifenesh Jun 6, 2025
d51483b
minor fixes
Yury-Fridlyand Jun 9, 2025
f5c97a6
typo fix
Yury-Fridlyand Jun 9, 2025
053853a
typo fix
Yury-Fridlyand Jun 9, 2025
97a3b42
typo fix
Yury-Fridlyand Jun 9, 2025
988de3f
Manually update attribution file.
Yury-Fridlyand Jun 10, 2025
b7cb1ae
hacky hack
Yury-Fridlyand Jun 11, 2025
f30a7d2
Add comment
Yury-Fridlyand Jun 11, 2025
1aa7ae6
Merge branch 'release-2.0' into go/ort-update
ikolomi Jun 15, 2025
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
23 changes: 21 additions & 2 deletions .github/workflows/ort.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
analyzer:
skip_excluded: true
allowDynamicVersions: true
enabledPackageManagers: [Cargo, NPM, PIP, GradleInspector]
enabledPackageManagers: [Cargo, GoMod, NPM, PIP, GradleInspector]
EOF
cat ~/.ort/config/config.yml

Expand Down Expand Up @@ -133,6 +133,12 @@ jobs:
with:
folder_path: "${{ github.workspace }}/glide-core"

### Rust FFI ###
- name: Run ORT tools for FFI
uses: ./.github/workflows/run-ort-tools
with:
folder_path: "${{ github.workspace }}/ffi"

### Java ###
- name: Set up JDK 11
uses: actions/setup-java@v4
Expand All @@ -156,6 +162,18 @@ jobs:
with:
folder_path: "${{ github.workspace }}/java"

### GO ###
- name: Set up GO
uses: actions/setup-go@v5
with:
go-version: 1.22

- name: Generate protobuf for GO
working-directory: ./go
run: |
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.33.0
make generate-protobuf

- name: Run ORT tools for Go
uses: ./.github/workflows/run-ort-tools
with:
Expand Down Expand Up @@ -215,14 +233,15 @@ jobs:
echo "No unapproved packages found."
fi

### Check for attributions diff ###
### Check for attributions diff ### (FFI attributions merged to FFI clients' attributions)
- name: Check for diff
run: |
cp python/ort_results/NOTICE_DEFAULT $PYTHON_ATTRIBUTIONS
cp node/ort_results/NOTICE_DEFAULT $NODE_ATTRIBUTIONS
cp glide-core/ort_results/NOTICE_DEFAULT $RUST_ATTRIBUTIONS
cp java/ort_results/NOTICE_DEFAULT $JAVA_ATTRIBUTIONS
cp go/ort_results/NOTICE_DEFAULT $GO_ATTRIBUTIONS
cat ffi/ort_results/NOTICE_DEFAULT >> $GO_ATTRIBUTIONS
GIT_DIFF=`git diff $PYTHON_ATTRIBUTIONS $NODE_ATTRIBUTIONS $RUST_ATTRIBUTIONS $JAVA_ATTRIBUTIONS $GO_ATTRIBUTIONS`
if [ -n "$GIT_DIFF" ]; then
echo "FOUND_DIFF=true" >> $GITHUB_ENV
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
* Core: Refactor socket listener to use a runtime that lives for the application lifetime [#3842](https://github.com/valkey-io/valkey-glide/pull/3842)
* Go: Add Function Dump & Restore ([#3721](https://github.com/valkey-io/valkey-glide/pull/3721))
* Python: Fix restore command ([#3853](https://github.com/valkey-io/valkey-glide/pull/3853))
* Update Go Ort ([#3469](https://github.com/valkey-io/valkey-glide/pull/3469))
* Go: Remove redundant implementations of echo ([#3859](https://github.com/valkey-io/valkey-glide/pull/3859))
* Java: Add toArgs() to restore batch command ([#3883](https://github.com/valkey-io/valkey-glide/pull/3883))
* Java: Add error restore command ([#3905](https://github.com/valkey-io/valkey-glide/pull/3905))
Expand Down
11 changes: 11 additions & 0 deletions ffi/.ort.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
excludes:
scopes:
- pattern: "devDependencies"
reason: "DEV_DEPENDENCY_OF"
comment: "Packages for development only."
- pattern: "build-dependencies"
reason: "BUILD_DEPENDENCY_OF"
comment: "Packages for building the code only."
- pattern: "dev-dependencies"
reason: "DEV_DEPENDENCY_OF"
comment: "Packages for development only."
30 changes: 30 additions & 0 deletions go/.ort.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
excludes:
scopes:
- pattern: "//indirect"
reason: "DEV_DEPENDENCY_OF"
comment: "Indirect dependencies used for development only."
- pattern: "github.com/stretchr/testify|github.com/google/uuid"
reason: "TEST_DEPENDENCY_OF"
comment: "Testing framework not included in production code."
paths:
- pattern: "integTest/**"
reason: "TEST_OF"
comment: "Integration test files not included in production code."
- pattern: "benchmarks/**"
reason: "TEST_TOOL_OF"
comment: "Benchmark files used for performance testing only."
- pattern: "examples/**"
reason: "EXAMPLE_OF"
comment: "Example code not included in production code."
- pattern: ".*"
reason: "BUILD_TOOL_OF"
comment: "Hidden files used for build configuration."
- pattern: "Makefile"
reason: "BUILD_TOOL_OF"
comment: "Build configuration file."
- pattern: "DEVELOPER.md"
reason: "DOCUMENTATION_OF"
comment: "Developer documentation."
- pattern: "rustbin/**"
reason: "BUILD_TOOL_OF"
comment: "Rust binary files used for building only."
Loading