Skip to content

Commit

Permalink
Upgrade runner to Ubuntu 24.04 (#3445)
Browse files Browse the repository at this point in the history
  • Loading branch information
mewim committed May 6, 2024
1 parent 6dc0e9f commit 93ce790
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 15 deletions.
40 changes: 29 additions & 11 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ jobs:

- name: Ensure Python dependencies
run: |
pip install torch~=2.0.0 --extra-index-url https://download.pytorch.org/whl/cpu
pip install --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-2.0.0+cpu.html
pip install torch~=2.2.0 --break-system-package --extra-index-url https://download.pytorch.org/whl/cpu
pip install --break-system-package --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-2.2.0+cpu.html
- name: Ensure Node.js dependencies
run: npm install --include=dev
Expand All @@ -58,8 +58,8 @@ jobs:
- name: Build
run: make all

- name: Test with coverage
run: make lcov
- name: Test
run: make test

- name: Python test
run: make pytest
Expand All @@ -70,6 +70,22 @@ jobs:
- name: Java test
run: make javatest

code-coverage:
name: code coverage
runs-on: ubuntu-22.04
needs: [clang-format, sanity-checks, python-lint-check]
env:
TEST_JOBS: 10
WERROR: 0
steps:
- uses: actions/checkout@v3

- name: Install lcov
run: sudo apt-get install -y lcov

- name: Test with coverage
run: make lcov NUM_THREADS=$(nproc)

- name: Generate coverage report
run: |
lcov --config-file .lcovrc -c -d ./ --no-external -o cover.info &&\
Expand Down Expand Up @@ -138,13 +154,14 @@ jobs:
GEN: ninja
CC: gcc
CXX: g++
WERROR: 0
steps:
- uses: actions/checkout@v3

- name: Ensure Python dependencies
run: |
pip install torch~=2.0.0 --extra-index-url https://download.pytorch.org/whl/cpu
pip install --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-2.0.0+cpu.html
pip install torch~=2.2.0 --break-system-package --extra-index-url https://download.pytorch.org/whl/cpu
pip install --break-system-package --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-2.2.0+cpu.html
- name: Ensure Node.js dependencies
run: npm install --include=dev
Expand Down Expand Up @@ -176,8 +193,8 @@ jobs:

- name: Ensure Python dependencies
run: |
pip install torch~=2.0.0 --extra-index-url https://download.pytorch.org/whl/cpu
pip install --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-2.0.0+cpu.html
pip install torch~=2.2.0 --break-system-package --extra-index-url https://download.pytorch.org/whl/cpu
pip install --break-system-package --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-2.2.0+cpu.html
- name: Ensure Node.js dependencies
run: npm install --include=dev
Expand Down Expand Up @@ -407,7 +424,7 @@ jobs:
- name: Ensure Python dependencies
run: |
pip3 install torch~=2.2.0 --break-system-package --extra-index-url https://download.pytorch.org/whl/cpu
pip3 install --break-system-package --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-2.0.0+cpu.html
pip3 install --break-system-package --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-2.2.0+cpu.html
- name: Ensure Node.js dependencies
run: npm install --include=dev
Expand Down Expand Up @@ -492,6 +509,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_S3_SECRET_ACCESS_KEY }}
RUN_ID: "$(hostname)-$(date +%s)"
ASAN_OPTIONS: detect_leaks=0
WERROR: 0

steps:
- uses: actions/checkout@v3
Expand All @@ -506,7 +524,7 @@ jobs:
cat postgres.test
- name: Install dependencies
run: pip install rangehttpserver
run: pip install --break-system-package rangehttpserver

- name: Extension test
run: |
Expand Down Expand Up @@ -542,7 +560,7 @@ jobs:
cat postgres.test
- name: Install dependencies
run: pip3 install --break-system-packages rangehttpserver
run: pip3 install --break-system-package rangehttpserver

- name: Extension test
run: |
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
endif()
if(NOT MSVC)
add_compile_options(-Wall -Wextra)
# Disable warnings for unknown pragmas, which is used by several third-party libraries
add_compile_options(-Wno-unknown-pragmas)
endif()

if(${ENABLE_THREAD_SANITIZER})
Expand Down
6 changes: 3 additions & 3 deletions extension/httpfs/src/httpfs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ std::unique_ptr<common::FileInfo> HTTPFileSystem::openFile(const std::string& pa
main::ClientContext* /*context*/, common::FileLockType /*lock_type*/) {
auto httpFileInfo = std::make_unique<HTTPFileInfo>(path, this, flags);
httpFileInfo->initialize();
return std::move(httpFileInfo);
return httpFileInfo;
}

std::vector<std::string> HTTPFileSystem::glob(main::ClientContext* /*context*/,
Expand Down Expand Up @@ -255,9 +255,9 @@ std::unique_ptr<HTTPResponse> HTTPFileSystem::runRequestWithRetry(
uint64_t tries = 0;
while (true) {
std::exception_ptr exception = nullptr;
httplib::Error err;
httplib::Error err = httplib::Error::Success;
httplib::Response response;
int status;
int status = 0;

try {
auto res = request();
Expand Down
2 changes: 1 addition & 1 deletion extension/httpfs/src/s3fs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ std::unique_ptr<common::FileInfo> S3FileSystem::openFile(const std::string& path
auto uploadParams = getS3UploadParams(context);
auto s3FileInfo = std::make_unique<S3FileInfo>(path, this, flags, authParams, uploadParams);
s3FileInfo->initialize();
return std::move(s3FileInfo);
return s3FileInfo;
}

bool likes(const char* string, uint64_t slen, const char* pattern, uint64_t plen) {
Expand Down

0 comments on commit 93ce790

Please sign in to comment.