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
15 changes: 14 additions & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
# SPDX-License-Identifier: BSD-2-Clause-Patent
# Copyright (C) 2024 Intel Corporation.

name: Trivy scan

on:
pull_request:
schedule:
- cron: '45 8 * * *'

push:
branches: ["master", "release/**"]

pull_request:
paths:
- '**/go.mod'
- '**/pom.xml'
- '**/requirements.txt'
- '**/*trivy*'

# Declare default permissions as nothing.
permissions: {}

Expand Down
1 change: 0 additions & 1 deletion src/client/dfs/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/

#define D_LOGFAC DD_FAC(dfs)

#include <daos/common.h>
Expand Down
1 change: 1 addition & 0 deletions src/client/java/daos-java/find_java_home.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env bash


java_home_path=$JAVA_HOME
if [ -n "$java_home_path" ]
then
Expand Down
2 changes: 1 addition & 1 deletion src/client/java/hadoop-daos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<packaging>jar</packaging>

<properties>
<hadoop.version>3.3.6</hadoop.version>
<hadoop.version>3.4.0</hadoop.version>
<native.build.path>${project.basedir}/build</native.build.path>
<daos.install.path>${project.basedir}/install</daos.install.path>
</properties>
Expand Down
3 changes: 1 addition & 2 deletions utils/trivy/trivy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
cache:
backend: fs
clear: false
backend: memory
dir:
redis:
ca: ""
Expand Down