Skip to content

Commit

Permalink
Merge branch 'develop' into us757-https-tls-chains_http_cert
Browse files Browse the repository at this point in the history
  • Loading branch information
aklyuchev authored Jan 5, 2025
2 parents f292504 + 21f05d1 commit f02597d
Show file tree
Hide file tree
Showing 3,983 changed files with 237,144 additions and 206,191 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 13 additions & 1 deletion .clang-format
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
BasedOnStyle: google
BasedOnStyle: Google
DerivePointerAlignment: false
IncludeBlocks: Preserve
AttributeMacros: ["noexcept"]
IndentRequires: false
ColumnLimit: 120
IndentWidth: 4
TabWidth: 4
AccessModifierOffset: -4
BinPackParameters: false
BinPackArguments: false
AllowAllParametersOfDeclarationOnNextLine: false
AlignAfterOpenBracket: BlockIndent
AlwaysBreakAfterDefinitionReturnType: None
PenaltyReturnTypeOnItsOwnLine: 200
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/0-default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Default
description: Feature request or bug report
body:
- type: markdown
attributes:
value: |
**Note:** By creating a PR or an issue you automatically agree to the CLA. See [CONTRIBUTING.md](https://github.com/userver-framework/userver/blob/develop/CONTRIBUTING.md).
- type: textarea
id: what-happened
attributes:
label: Add a description
placeholder: Tell us what you see!
validations:
required: true
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: false
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
10 changes: 10 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@







------------------------
Note: by creating a PR or an issue you automatically agree to the CLA. See [CONTRIBUTING.md](https://github.com/userver-framework/userver/blob/develop/CONTRIBUTING.md). Feel free to remove this note, the agreement holds.

79 changes: 79 additions & 0 deletions .github/workflows/alpine.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Alpine Linux

'on':
pull_request:
push:
branches:
- master
- develop
- feature/**

env:
UBSAN_OPTIONS: print_stacktrace=1
ASAN_OPTIONS: detect_odr_violation=2
CXX: clang++-18
CC: clang-18

jobs:
posix:
strategy:
fail-fast: false

name: Build only
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup latest Alpine Linux
uses: jirutka/setup-alpine@v1

- name: Install dependencies
shell: alpine.sh --root {0}
run: |
pwd
cat /etc/alpine-release
apk add lld
apk add $(cat scripts/docs/en/deps/alpine.md)
- name: Install test dependencies
shell: alpine.sh --root {0}
run: |
apk add postgresql16 \
redis \
rabbitmq-server \
- name: Run cmake
shell: alpine.sh {0}
run: |
pwd
mkdir build_debug
cd build_debug
CMAKE_PROGRAM_PATH=/usr/lib/llvm17/bin/ \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DUSERVER_NO_WERROR=OFF \
-DUSERVER_BUILD_ALL_COMPONENTS=1 \
-DUSERVER_BUILD_SAMPLES=1 \
-DUSERVER_BUILD_TESTS=1 \
-DUSERVER_FEATURE_JEMALLOC=OFF \
-DUSERVER_FEATURE_KAFKA=OFF \
-DUSERVER_FEATURE_CLICKHOUSE=OFF \
-DUSERVER_FEATURE_STACKTRACE=OFF \
-DUSERVER_FEATURE_PATCH_LIBPQ=OFF \
-DUSERVER_DOWNLOAD_PACKAGE_PROTOBUF=ON \
-DUSERVER_DISABLE_RSEQ_ACCELERATION=YES \
-DUSERVER_FORCE_DOWNLOAD_ABSEIL=1 \
-DUSERVER_FORCE_DOWNLOAD_PROTOBUF=1 \
-DUSERVER_FORCE_DOWNLOAD_GRPC=1 \
-DUSERVER_USE_LD=lld \
..
- name: Compile
shell: alpine.sh {0}
run: |
cd build_debug
cmake --build . -j$(nproc)
53 changes: 33 additions & 20 deletions .github/workflows/ci-conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,39 +13,52 @@ env:

jobs:
build:
runs-on: ubuntu-${{ matrix.ubuntu_version }}
name: Ubuntu-${{ matrix.ubuntu_version }}
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
ubuntu_version: [22.04]
include:
- os: ubuntu-22.04
conanflags: ''
- os: macos-latest
conanflags: '-o python_path=python3.11'

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Reuse ccache directory
uses: actions/cache@v2
with:
path: ~/.ccache
key: '${{matrix.os}} ${{matrix.info}} ccache-dir ${{github.ref}} run-${{github.run_number}}'
restore-keys: |
${{matrix.os}} ${{matrix.info}} ccache-dir ${{github.ref}} run-'
${{matrix.os}} ${{matrix.info}} ccache-
- name: Install Ubuntu packages
if: matrix.os == 'ubuntu-22.04'
run: |
sudo apt-get install -y gcc g++ cmake wget git python3 python3-pip python3-venv postgresql
- name: Install packages
- name: Install MacOS packages
if: matrix.os == 'macos-latest'
run: |
sudo apt-get install -y gcc g++ cmake wget git python3 python3-pip python3-venv ccache
pip install "conan>=1.51.0,<2.0.0"
conan profile new --detect default && conan profile update settings.compiler.libcxx=libstdc++11 default
brew update
brew install postgresql
brew install libiconv # https://stackoverflow.com/questions/57734434/libiconv-or-iconv-undefined-symbol-on-mac-osx
brew install [email protected]
- name: Setup ccache
- name: Install common packages
run: |
ccache -M 2.0GB
ccache -s
pip install "conan==2.8.0"
pip install numpy
conan profile detect
conan profile show
- name: Run conan
run: |
conan create . --build=missing -pr:b=default -tf conan/test_package/
conan create . --build=missing -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}}
- name: Test userver conan package
run: |
USERVER_VERSION=$(conan list -c -v quiet userver/* | tail -n 1)
for SAMPLE in hello_service embedded_files postgres_service grpc_service; do
cp scripts/tests/conanfile.py samples/$SAMPLE/
conan test samples/$SAMPLE/ --build=never -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}} ${USERVER_VERSION}
rm samples/$SAMPLE/conanfile.py
done
Loading

0 comments on commit f02597d

Please sign in to comment.