From: Matthieu Date: Fri, 6 Aug 2021 15:04:19 +0000 (+0400) Subject: resolve merge conflicts X-Git-Tag: v0.1~87 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d859ba28a58ddb72e776c8fa25277b6a0cd1b62d;p=matthieu%2Fnova.git resolve merge conflicts --- d859ba28a58ddb72e776c8fa25277b6a0cd1b62d diff --cc .github/workflows/bazel-build.yml index 19bafb4,930533d..555d6f5 --- a/.github/workflows/bazel-build.yml +++ b/.github/workflows/bazel-build.yml @@@ -1,53 -1,48 +1,51 @@@ -# This is a basic workflow to help you get started with Actions - -name: Build - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the main branch - push: - branches: [ main ] - pull_request: - branches: [ main ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - name: Setup Bazelisk - # You may pin to the exact commit or the version. - # uses: bazelbuild/setup-bazelisk@2351cf5a7584ce72638fbce7c22e5128a5fcd5b2 - uses: bazelbuild/setup-bazelisk@v1.0.1 - with: - # The Bazelisk version to download (if necessary) and use. Supports semver spec and ranges. - bazelisk-version: 1.x # optional, default is 1.x - # Used to query bazelisk releases. Since there's a default, this is typically not supplied by the user. - token: ${{ github.token }} - # Runs a set of commands using the runners shell - - name: Execute build script - run: | - sudo apt-get install -y pkg-config libssl-dev - bazel run //:gazelle - bazel run @cargo_raze//:raze -- --manifest-path=$(realpath rest-ralimiter/Cargo.toml) - bazel build //... - - name: Bazel artifacts - uses: actions/upload-artifact@v2 - with: - name: bazel-artifacts - path: | - bazel-out/ - bazel-bin/ +# This is a basic workflow to help you get started with Actions + +name: Build + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the main branch + push: + branches: [ main ] + pull_request: + branches: [ main ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + - name: Setup Bazelisk + # You may pin to the exact commit or the version. + # uses: bazelbuild/setup-bazelisk@2351cf5a7584ce72638fbce7c22e5128a5fcd5b2 + uses: bazelbuild/setup-bazelisk@v1.0.1 + with: + # The Bazelisk version to download (if necessary) and use. Supports semver spec and ranges. + bazelisk-version: 1.x # optional, default is 1.x + # Used to query bazelisk releases. Since there's a default, this is typically not supplied by the user. + token: ${{ github.token }} + # Runs a single command using the runners shell + - name: Mount bazel cache # Optional + uses: actions/cache@v2 + with: + path: "~/.cache/bazel" + key: bazel + # Runs a set of commands using the runners shell + - name: Execute build script + run: | - bazel run //:gazelle - bazel run @cargo_raze//:raze -- --manifest-path=$(realpath rest-ralimiter/Cargo.toml) + bazel build //... + - name: Bazel artifacts + uses: actions/upload-artifact@v2 + with: + name: bazel-artifacts + path: | + bazel-out/ + bazel-bin/ diff --cc .vscode/settings.json index ebd1bbc,f5b75bd..7c66c19 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@@ -1,10 -1,10 +1,10 @@@ -{ - "files.exclude": { - "**/.git": true, - "**/.svn": true, - "**/.hg": true, - "**/CVS": true, - "**/.DS_Store": true, - "**/bazel-*": true - } +{ + "files.exclude": { + "**/.git": true, + "**/.svn": true, + "**/.hg": true, + "**/CVS": true, + "**/.DS_Store": true, - "**/bazel-*": true ++ "./bazel-*": true + } } diff --cc rest-ratelimiter/Cargo.toml index 4d23c5e,f72d3e7..874ea26 --- a/rest-ratelimiter/Cargo.toml +++ b/rest-ratelimiter/Cargo.toml @@@ -1,22 -1,25 +1,22 @@@ - [package] - name = "rest-ratelimiter" - version = "0.1.0" - edition = "2018" - - [dependencies] - tonic = "0.5" - prost = "0.8" - tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] } - - [[bin]] - name = "rest-ratelimiter" - path = "src/main.rs" - - [dev-dependencies] - tonic-build = "0.5" - - [package.metadata.raze] - workspace_path = "//rest-ratelimiter/cargo" - genmode = "Remote" - default_gen_buildrs = true - package_aliases_dir = "cargo" + [package] + name = "rest-ratelimiter" + version = "0.1.0" + edition = "2018" + + [dependencies] + tonic = "0.5" + prost = "0.8" -openssl-sys = "0.9" -openssl = "0.10" + tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] } + -[build-dependencies] ++[[bin]] ++name = "rest-ratelimiter" ++path = "src/main.rs" ++ ++[dev-dependencies] + tonic-build = "0.5" + + [package.metadata.raze] -# The path at which to write output files. -# -# `cargo raze` will generate Bazel-compatible BUILD files into this path. -# This can either be a relative path (e.g. "foo/bar"), relative to this -# Cargo.toml file; or relative to the Bazel workspace root (e.g. "//foo/bar"). -workspace_path = "//rest-ratelimiter" ++workspace_path = "//rest-ratelimiter/cargo" + genmode = "Remote" + default_gen_buildrs = true - ++package_aliases_dir = "cargo"