Skip to content

Commit

Permalink
fix(workflow): detected dubious ownership in repository (#4005)
Browse files Browse the repository at this point in the history
* fix: fix error in selfhost_integration

Signed-off-by: shouren <[email protected]>

* update: reduce nonnull warnings

Signed-off-by: shouren <[email protected]>

---------

Signed-off-by: shouren <[email protected]>
  • Loading branch information
Shouren authored Dec 23, 2024
1 parent 7d9dfbe commit e484c9a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 25 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,13 @@ on:

env:
GIT_SUBMODULE_STRATEGY: recursive
NPROC: 5 # default Parallel build number for GitHub's Linux runner
NPROC: 2 # default Parallel build number for GitHub's Linux runner
EXAMPLES_ENABLE: OFF # turn off hybridse's example code
HYBRIDSE_TESTING_ENABLE: OFF # turn off hybridse's test code
# ref https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

jobs:
openmldb-test-python:
runs-on: [self-hosted,generic]
env:
ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
container:
image: ghcr.io/4paradigm/hybridsql:latest
steps:
Expand Down
26 changes: 8 additions & 18 deletions .github/workflows/selfhost_intergration.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: SELFHOST-INTEGRATION-TEST
on:

schedule:
- cron: '0 14 * * *'

Expand All @@ -20,25 +19,20 @@ env:
E_VERSION: ${{ github.event.inputs.EXEC_VERSION || 'main'}}
ETYPE: ${{ github.event.inputs.EXEC_TEST_TYPE || 'all'}}
NPROC: 4
# ref https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

jobs:
build-openmldb:

runs-on: [self-hosted,generic]
if: github.repository == '4paradigm/OpenMLDB'
container:
image: ghcr.io/4paradigm/hybridsql:latest
env:
ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
OS: linux
steps:
- uses: actions/checkout@v2
- name: build
if: ${{ env.E_VERSION == 'main' }}
run: |
git config --system --add safe.directory $(pwd)
make configure CMAKE_INSTALL_PREFIX=openmldb-linux
make SQL_JAVASDK_ENABLE=ON && make SQL_JAVASDK_ENABLE=ON install
mv openmldb-linux openmldb-main-linux
Expand All @@ -61,7 +55,8 @@ jobs:
openmldb-jdbc.jar
openmldb-native.jar
openmldb-linux.tar.gz
apiserver-cluster:
needs: build-openmldb

Expand Down Expand Up @@ -114,10 +109,10 @@ jobs:
to: ${{ secrets.MAIL_TO }}
from: GitHub Actions
attachments: surefire-reports.tar.gz



java-sdk-cluster-memory-0:
needs: build-openmldb

runs-on: [self-hosted,common-user]
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -168,8 +163,7 @@ jobs:
from: GitHub Actions
attachments: surefire-reports.tar.gz




java-sdk-cluster-memory-1:
needs: build-openmldb
runs-on: [self-hosted,common-user]
Expand Down Expand Up @@ -222,9 +216,7 @@ jobs:
from: GitHub Actions
attachments: surefire-reports.tar.gz





java-sdk-cluster-hdd:
needs: build-openmldb
runs-on: [self-hosted,common-user]
Expand Down Expand Up @@ -277,7 +269,6 @@ jobs:
from: GitHub Actions
attachments: surefire-reports.tar.gz



java-sdk-cluster-ssd:
needs: build-openmldb
Expand Down Expand Up @@ -331,7 +322,7 @@ jobs:
from: GitHub Actions
attachments: surefire-reports.tar.gz


java-sdk-yarn:
needs: build-openmldb
runs-on: [self-hosted,common-user]
Expand Down Expand Up @@ -387,7 +378,6 @@ jobs:
attachments: surefire-reports.tar.gz



java-sdk-kafka:
needs: build-openmldb
runs-on: [self-hosted,common-user]
Expand Down
7 changes: 7 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,17 @@ function(compile_lib LIB_NAME DIR DEPEND_FILE_LIST)
set(FILE_STR_LIST "${FILE_STR_LIST} ${DEPEND_FILE_LIST}")
string(REPLACE " " ";" FILE_LIST ${FILE_STR_LIST})
add_library(${LIB_NAME} STATIC ${FILE_LIST} $<TARGET_OBJECTS:openmldb_proto>)

# TODO: Fix me after upgrade Boost or fix nonnull errors in Boost
target_compile_options(${LIB_NAME} PRIVATE
$<$<COMPILE_LANGUAGE:CXX>:-Wno-error=nonnull>
$<$<COMPILE_LANGUAGE:C>:-Wno-error=nonnull>
)
target_compile_options(${LIB_NAME} PRIVATE
$<$<COMPILE_LANGUAGE:CXX>:-Wno-nonnull>
$<$<COMPILE_LANGUAGE:C>:-Wno-nonnull>
)

endfunction(compile_lib)

set(TEST_LIBS
Expand Down
8 changes: 7 additions & 1 deletion src/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@
# WARN: do not link in production

add_library(openmldb_test_base base_test.cc util.cc)
target_compile_options(openmldb_test_base PRIVATE

# TODO: Fix me after upgrade Boost or fix nonnull errors in Boost
target_compile_options(${LIB_NAME} PRIVATE
$<$<COMPILE_LANGUAGE:CXX>:-Wno-error=nonnull>
$<$<COMPILE_LANGUAGE:C>:-Wno-error=nonnull>
)
target_compile_options(${LIB_NAME} PRIVATE
$<$<COMPILE_LANGUAGE:CXX>:-Wno-nonnull>
$<$<COMPILE_LANGUAGE:C>:-Wno-nonnull>
)

add_dependencies(openmldb_test_base openmldb_sdk tablet nameserver)
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.1")
Expand Down

0 comments on commit e484c9a

Please sign in to comment.