Skip to content

Commit 6499df7

Browse files
committed
Merge branch 'master' into http-lca
2 parents 06d6eb8 + 80625ed commit 6499df7

6 files changed

Lines changed: 11 additions & 3 deletions

File tree

‎.github/scripts/bazel_build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ BAZEL_BINARY_OUTPUTS=(
7070
"bazel-bin/busnode"
7171
"bazel-bin/busclient"
7272
"bazel-bin/database_adapter"
73+
"bazel-bin/authorization_admin"
7374
)
7475

7576
BAZEL_LIB_OUTPUTS=(

‎.github/workflows/run-format-check.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ jobs:
88
format-check:
99
runs-on:
1010
- self-hosted-withcache
11+
- amd64
1112
- ${{ github.actor }}
1213
steps:
1314
- name: Checkout

‎.github/workflows/run-unit-tests-no-cache.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
runs-on:
1010
- self-hosted
1111
- self-hosted-nocache
12+
- amd64
1213
env:
1314
DAS_REDIS_HOSTNAME: localhost
1415
DAS_REDIS_PORT: 40020

‎.github/workflows/run-unit-tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
unit-tests:
1818
runs-on:
1919
- self-hosted
20+
- amd64
2021
- ${{ inputs.runner }}
2122
- ${{ github.actor }}
2223
env:

‎src/.bazelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ common --enable_bzlmod
2121
build --spawn_strategy=local
2222

2323
# Define versions
24-
build --define=DAS_VERSION=1.2.1
24+
build --define=DAS_VERSION=1.2.2
2525

2626
# Enable debugging symbols for development
2727
build:debug --compilation_mode=dbg

‎src/docker/mork/Dockerfile.server‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ WORKDIR /opt
1111
RUN git clone -b server https://github.com/trueagi-io/MORK.git \
1212
&& cd MORK \
1313
&& git checkout ${COMMIT_ID} \
14-
&& sed -i 's/branch = "master"/rev = "cd30438cc1056ba819d88aa22c783ba4dd6c8e1c"/' Cargo.toml \
14+
&& sed -i 's/branch = "master"/rev = "cd30438cc1056ba819d88aa22c783ba4dd6c8e1c"/' Cargo.toml \
15+
&& git clone https://github.com/ogxd/gxhash.git /opt/gxhash \
16+
&& git -C /opt/gxhash checkout 6438a7bc2a78d9426bea7671a044f82d3f767dc2 \
17+
&& printf '\n[patch."https://github.com/luketpeterson/gxhash/"]\ngxhash = { path = "/opt/gxhash" }\n[patch.crates-io]\ngxhash = { path = "/opt/gxhash" }\n' >> Cargo.toml \
1518
&& cd server \
16-
&& cargo build --release
19+
&& cargo generate-lockfile --config 'resolver.incompatible-rust-versions="fallback"' \
20+
&& cargo build --release --locked
1721

1822
FROM gcr.io/distroless/cc
1923

0 commit comments

Comments
 (0)