Skip to content
Closed
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
File renamed without changes.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm afraid that this would break the dependabot.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,28 +114,28 @@ jobs:
run: ./scripts/githubci_free_space.sh

- name: Setup ccache
run: docker-compose -f .github/docker-compose.yml run --rm ${{ matrix.image
run: docker-compose -f .github/docker-compose.yaml run --rm ${{ matrix.image
}} bash -c 'ccache -M 2.0GB && ccache -s -v'

- name: Run cmake
run: >-
docker-compose -f .github/docker-compose.yml
docker-compose -f .github/docker-compose.yaml
run --rm ${{ matrix.image }} bash -c
'cd /userver && cmake -DUSERVER_GOOGLE_COMMON_PROTOS=/app/api-common-protos
-DUSERVER_OPENTELEMETRY_PROTO=/app/opentelemetry-proto
${{ matrix.cmake-flags }} -B./build -S./'

- name: Reconfigure cmake
run: >-
docker-compose -f .github/docker-compose.yml
docker-compose -f .github/docker-compose.yaml
run --rm ${{ matrix.image }} bash -c
'cd /userver && cmake -DUSERVER_GOOGLE_COMMON_PROTOS=/app/api-common-protos
-DUSERVER_OPENTELEMETRY_PROTO=/app/opentelemetry-proto
${{ matrix.cmake-flags }} -B./build -S./'

- name: Compile
run: >-
docker-compose -f .github/docker-compose.yml
docker-compose -f .github/docker-compose.yaml
run --rm ${{ matrix.image }} bash -c
'cd /userver && cmake --build build -j $(nproc)'

Expand All @@ -149,19 +149,19 @@ jobs:

- name: Run ydb
if: matrix.id == 'ubuntu_clang16_cxx20' || matrix.id == 'ubuntu_gcc13_cxx20'
run: docker-compose -f .github/docker-compose.yml run -d --rm run-ydb
run: docker-compose -f .github/docker-compose.yaml run -d --rm run-ydb

- name: Watch ydb
if: matrix.id == 'ubuntu_clang16_cxx20' || matrix.id == 'ubuntu_gcc13_cxx20'
run: >-
docker-compose -f .github/docker-compose.yml
docker-compose -f .github/docker-compose.yaml
run --rm ${{ matrix.image}} bash -c
'curl --retry 15 --retry-all-errors --retry-delay 5 -s -o /dev/null
http://run-ydb:8765/monitoring/ -v'

- name: Run tests
run: >-
docker-compose -f .github/docker-compose.yml
docker-compose -f .github/docker-compose.yaml
run --rm ${{ matrix.image}} bash -c
'cd /userver/build && ulimit -n 4096 && GTEST_FILTER="${{ matrix.gtest-filter
}}" TESTSUITE_REDIS_HOSTNAME=::1 ctest -V'
File renamed without changes.
File renamed without changes.
30 changes: 15 additions & 15 deletions .mapping.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@
".devcontainer/devcontainer.json":"taxi/uservices/userver/.devcontainer/devcontainer.json",
".editorconfig":"taxi/uservices/userver/.editorconfig",
".gitattributes":"taxi/uservices/userver/.gitattributes",
".github/ISSUE_TEMPLATE/0-default.yml":"taxi/uservices/userver/.github/ISSUE_TEMPLATE/0-default.yml",
".github/ISSUE_TEMPLATE/config.yml":"taxi/uservices/userver/.github/ISSUE_TEMPLATE/config.yml",
".github/dependabot.yml":"taxi/uservices/userver/.github/dependabot.yml",
".github/docker-compose.yml":"taxi/uservices/userver/.github/docker-compose.yml",
".github/ISSUE_TEMPLATE/0-default.yaml":"taxi/uservices/userver/.github/ISSUE_TEMPLATE/0-default.yaml",
".github/ISSUE_TEMPLATE/config.yaml":"taxi/uservices/userver/.github/ISSUE_TEMPLATE/config.yaml",
".github/dependabot.yaml":"taxi/uservices/userver/.github/dependabot.yaml",
".github/docker-compose.yaml":"taxi/uservices/userver/.github/docker-compose.yaml",
".github/pull_request_template.md":"taxi/uservices/userver/.github/pull_request_template.md",
".github/workflows/alpine.yml":"taxi/uservices/userver/.github/workflows/alpine.yml",
".github/workflows/archlinux.yml":"taxi/uservices/userver/.github/workflows/archlinux.yml",
".github/workflows/ci-conan.yml":"taxi/uservices/userver/.github/workflows/ci-conan.yml",
".github/workflows/ci.yml":"taxi/uservices/userver/.github/workflows/ci.yml",
".github/workflows/codeql-analysis.yml":"taxi/uservices/userver/.github/workflows/codeql-analysis.yml",
".github/workflows/debian.yml":"taxi/uservices/userver/.github/workflows/debian.yml",
".github/workflows/alpine.yaml":"taxi/uservices/userver/.github/workflows/alpine.yaml",
".github/workflows/archlinux.yaml":"taxi/uservices/userver/.github/workflows/archlinux.yaml",
".github/workflows/ci-conan.yaml":"taxi/uservices/userver/.github/workflows/ci-conan.yaml",
".github/workflows/ci.yaml":"taxi/uservices/userver/.github/workflows/ci.yaml",
".github/workflows/codeql-analysis.yaml":"taxi/uservices/userver/.github/workflows/codeql-analysis.yaml",
".github/workflows/debian.yaml":"taxi/uservices/userver/.github/workflows/debian.yaml",
".github/workflows/docker.yaml":"taxi/uservices/userver/.github/workflows/docker.yaml",
".github/workflows/fedora.yml":"taxi/uservices/userver/.github/workflows/fedora.yml",
".github/workflows/macos.yml":"taxi/uservices/userver/.github/workflows/macos.yml",
".github/workflows/fedora.yaml":"taxi/uservices/userver/.github/workflows/fedora.yaml",
".github/workflows/macos.yaml":"taxi/uservices/userver/.github/workflows/macos.yaml",
".github/workflows/publish-ubuntu-22.04-base-images.yaml":"taxi/uservices/userver/.github/workflows/publish-ubuntu-22.04-base-images.yaml",
".github/workflows/publish-ubuntu-22.04-images.yaml":"taxi/uservices/userver/.github/workflows/publish-ubuntu-22.04-images.yaml",
".github/workflows/publish-ubuntu-24.04-images.yaml":"taxi/uservices/userver/.github/workflows/publish-ubuntu-24.04-images.yaml",
".github/workflows/ubuntu-minimal.yml":"taxi/uservices/userver/.github/workflows/ubuntu-minimal.yml",
".github/workflows/ubuntu-minimal.yaml":"taxi/uservices/userver/.github/workflows/ubuntu-minimal.yaml",
".gitignore":"taxi/uservices/userver/.gitignore",
"AUTHORS":"taxi/uservices/userver/AUTHORS",
"CMakeLists.txt":"taxi/uservices/userver/CMakeLists.txt",
Expand Down Expand Up @@ -4774,8 +4774,8 @@
"service_template/.clang-format":"taxi/uservices/userver/service_template/.clang-format",
"service_template/.devcontainer/README.md":"taxi/uservices/userver/service_template/.devcontainer/README.md",
"service_template/.devcontainer/devcontainer.json":"taxi/uservices/userver/service_template/.devcontainer/devcontainer.json",
"service_template/.github/dependabot.yml":"taxi/uservices/userver/service_template/.github/dependabot.yml",
"service_template/.github/workflows/ci.yml":"taxi/uservices/userver/service_template/.github/workflows/ci.yml",
"service_template/.github/dependabot.yaml":"taxi/uservices/userver/service_template/.github/dependabot.yaml",
"service_template/.github/workflows/ci.yaml":"taxi/uservices/userver/service_template/.github/workflows/ci.yaml",
"service_template/.github/workflows/docker.yaml":"taxi/uservices/userver/service_template/.github/workflows/docker.yaml",
"service_template/.gitignore":"taxi/uservices/userver/service_template/.gitignore",
"service_template/.vscode/README.md":"taxi/uservices/userver/service_template/.vscode/README.md",
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# userver [<img src="./scripts/docs/img/logo.svg" align='right' width="10%">](https://userver.tech/)

[![Ubuntu](https://github.com/userver-framework/userver/actions/workflows/ci.yml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/ci.yml)
[![Fedora](https://github.com/userver-framework/userver/actions/workflows/fedora.yml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/fedora.yml)
[![Debian](https://github.com/userver-framework/userver/actions/workflows/debian.yml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/debian.yml)
[![MacOS](https://github.com/userver-framework/userver/actions/workflows/macos.yml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/macos.yml)
[![Alpine](https://github.com/userver-framework/userver/actions/workflows/alpine.yml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/alpine.yml)
[![Arch](https://github.com/userver-framework/userver/actions/workflows/archlinux.yml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/archlinux.yml)
[![Ubuntu](https://github.com/userver-framework/userver/actions/workflows/ci.yaml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/ci.yaml)
[![Fedora](https://github.com/userver-framework/userver/actions/workflows/fedora.yaml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/fedora.yaml)
[![Debian](https://github.com/userver-framework/userver/actions/workflows/debian.yaml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/debian.yaml)
[![MacOS](https://github.com/userver-framework/userver/actions/workflows/macos.yaml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/macos.yaml)
[![Alpine](https://github.com/userver-framework/userver/actions/workflows/alpine.yaml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/alpine.yaml)
[![Arch](https://github.com/userver-framework/userver/actions/workflows/archlinux.yaml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/archlinux.yaml)
[![Docker CI](https://github.com/userver-framework/userver/actions/workflows/docker.yaml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/docker.yaml)
[![Conan](https://github.com/userver-framework/userver/actions/workflows/ci-conan.yml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/ci-conan.yml)
[![CodeQL](https://github.com/userver-framework/userver/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/codeql-analysis.yml)
[![Conan](https://github.com/userver-framework/userver/actions/workflows/ci-conan.yaml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/ci-conan.yaml)
[![CodeQL](https://github.com/userver-framework/userver/actions/workflows/codeql-analysis.yaml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/codeql-analysis.yaml)

[![Build and publish ubuntu-24.04-userver images](https://github.com/userver-framework/userver/actions/workflows/publish-ubuntu-24.04-images.yaml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/publish-ubuntu-24.04-images.yaml)
[![Build and publish ubuntu-22.04-userver images](https://github.com/userver-framework/userver/actions/workflows/publish-ubuntu-22.04-images.yaml/badge.svg)](https://github.com/userver-framework/userver/actions/workflows/publish-ubuntu-22.04-images.yaml)

[![uservice-dynconf CI](https://github.com/userver-framework/uservice-dynconf/actions/workflows/ci.yml/badge.svg)](https://github.com/userver-framework/uservice-dynconf/actions/workflows/ci.yml)
[![uservice-dynconf CI](https://github.com/userver-framework/uservice-dynconf/actions/workflows/ci.yaml/badge.svg)](https://github.com/userver-framework/uservice-dynconf/actions/workflows/ci.yaml)
[![uservice-dynconf Docker build](https://github.com/userver-framework/uservice-dynconf/actions/workflows/docker.yaml/badge.svg?branch=develop)](https://github.com/userver-framework/uservice-dynconf/actions/workflows/docker.yaml)
[![urealmedium CI](https://github.com/userver-framework/realmedium_sample/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/userver-framework/realmedium_sample/actions/workflows/ci.yml)
[![urealmedium CI](https://github.com/userver-framework/realmedium_sample/actions/workflows/ci.yaml/badge.svg?branch=develop)](https://github.com/userver-framework/realmedium_sample/actions/workflows/ci.yaml)
[![urealmedium Docker build](https://github.com/userver-framework/realmedium_sample/actions/workflows/docker.yaml/badge.svg?branch=develop)](https://github.com/userver-framework/realmedium_sample/actions/workflows/docker.yaml)
[![upastebin CI](https://github.com/userver-framework/upastebin/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/userver-framework/upastebin/actions/workflows/ci.yml)
[![upastebin CI](https://github.com/userver-framework/upastebin/actions/workflows/ci.yaml/badge.svg?branch=develop)](https://github.com/userver-framework/upastebin/actions/workflows/ci.yaml)
[![upastebin Docker](https://github.com/userver-framework/upastebin/actions/workflows/docker.yaml/badge.svg?branch=develop)](https://github.com/userver-framework/upastebin/actions/workflows/docker.yaml)


Expand Down
Loading