Skip to content

Commit e4292a3

Browse files
committed
Merge remote-tracking branch 'origin/main' into cis2-client
2 parents 1adb812 + b13950b commit e4292a3

File tree

33 files changed

+6640
-4937
lines changed

33 files changed

+6640
-4937
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
env:
1515
RUST_FMT: nightly-2023-04-01-x86_64-unknown-linux-gnu
16-
RUST_CLIPPY: "1.70"
16+
RUST_CLIPPY: "1.74"
1717

1818
jobs:
1919
"lint_fmt":

.github/workflows/release.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Release workflow
2+
3+
on:
4+
workflow_dispatch:
5+
6+
env:
7+
RUST_VERSION: rust:1.74-buster
8+
9+
jobs:
10+
11+
build-and-push:
12+
runs-on: ubuntu-latest
13+
environment: release-recover-id-object
14+
steps:
15+
- name: Check out the repo
16+
uses: actions/checkout@v4
17+
with:
18+
submodules: recursive
19+
- name: Set up Docker Buildx
20+
uses: docker/setup-buildx-action@v3
21+
- name: Log in to DockerHub
22+
uses: docker/login-action@v3
23+
with:
24+
username: ${{ secrets.DOCKER_USERNAME }}
25+
password: ${{ secrets.DOCKER_TOKEN }}
26+
- name: Extract Cargo package version
27+
id: cargo_version
28+
run: |
29+
cd recover-id-object
30+
VERSION=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
31+
echo "Extracted version is $VERSION"
32+
echo "::set-output name=version::$VERSION"
33+
- name: Build and push Docker image
34+
uses: docker/build-push-action@v5
35+
with:
36+
context: .
37+
file: recover-id-object/scripts/Dockerfile
38+
push: true
39+
build-args: |
40+
build_image=${{ env.RUST_VERSION }}
41+
tags: concordium/recover-id-object:${{ steps.cargo_version.outputs.version }}

chain-prometheus-exporter/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
## Unreleased changes
22

3+
## 1.1.2
4+
5+
- Retry requests to the node once.
6+
7+
## 1.1.1
8+
9+
- Add keep-alive to node connection.
10+
311
## 1.1.0
412

513
- Support protocol version 6.

0 commit comments

Comments
 (0)