Skip to content

Commit

Permalink
Fixups from first run of pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
bbockelm committed Jun 9, 2024
1 parent 11f76cd commit 772a60e
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 13 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: Lint

# If the linter fails, the PR can still be completed, but none of the linter changes will be made.

on:
on:
push:
branches:
- main
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Check out repository (push)
if: ${{ github.event_name == 'push' }}
uses: actions/checkout@v3

- name: Check out repository (pull_request_target)
if: ${{ github.event_name == 'pull_request_target' }}
uses: actions/checkout@v3
Expand All @@ -57,4 +57,3 @@ jobs:
uses: reviewdog/action-suggester@v1
with:
tool_name: lint

12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Test

on:
pull_request:
branches:
branches:
- main
push:
branches:
branches:
- main

env:
Expand All @@ -29,7 +29,7 @@ jobs:
- name: install deps
run: |
sudo apt update && sudo apt-get install -y cmake libcurl4-openssl-dev libcurl4 pkg-config libssl-dev libxrootd-dev libxrootd-server-dev libgtest-dev
- name: Create Build Environment
# Some projects don't allow in-source building, so create a separate build directory
# We'll use this as our working directory for all subsequent commands
Expand All @@ -40,8 +40,8 @@ jobs:
# access regardless of the host operating system
shell: bash
working-directory: ${{runner.workspace}}/build
# Note the current convention is to use the -S and -B options here to specify source
# and build directories, but this is only available with CMake 3.13 and higher.
# Note the current convention is to use the -S and -B options here to specify source
# and build directories, but this is only available with CMake 3.13 and higher.
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DXROOTD_PLUGINS_BUILD_UNITTESTS=yes -DXROOTD_PLUGINS_EXTERNAL_GTEST=${{ matrix.external-gtest }}

Expand All @@ -54,6 +54,6 @@ jobs:
- name: Test
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest -C $BUILD_TYPE --verbose
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ endmacro(use_cxx17)
use_cxx17()

if( CMAKE_COMPILER_IS_GNUCXX )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror" )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror" )
endif()

if(NOT APPLE)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,4 @@ In a separate terminal, run

```
curl -v http://localhost:1094/<path name>/<object name>
```
```
1 change: 0 additions & 1 deletion rpm/xrootd-s3-http.spec
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,3 @@ make install DESTDIR=$RPM_BUILD_ROOT

* Tue Dec 06 2022 Brian Bockelman <[email protected]> - 0.0.1-1
- Initial, "Hello world" version of the S3 filesystem plugin

2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ add_executable( s3-gtest s3_tests.cc
../src/S3FileSystem.cc
../src/shortfile.cc
../src/stl_string_utils.cc
../src/HTTPCommands.cc
../src/HTTPCommands.cc
../src/S3Commands.cc
)

Expand Down

0 comments on commit 772a60e

Please sign in to comment.