Skip to content

Commit 30797cb

Browse files
rockett-mHalosGhost
authored andcommitted
ci: update gh actions and ubuntu version to 22.04+; fixes #266
Signed-off-by: Morgan Rockett <[email protected]>
1 parent 005672c commit 30797cb

File tree

6 files changed

+30
-29
lines changed

6 files changed

+30
-29
lines changed

.github/workflows/ci.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
env:
2323
BUILD_RELEASE: 1
2424
steps:
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v4
2626
with:
2727
submodules: recursive
2828
- name: Setup Build Env
@@ -33,9 +33,9 @@ jobs:
3333
run: ./scripts/build.sh
3434
lint:
3535
name: Lint
36-
runs-on: ubuntu-20.04
36+
runs-on: ubuntu-22.04
3737
steps:
38-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v4
3939
with:
4040
submodules: recursive
4141
- name: Setup Build Env
@@ -55,11 +55,11 @@ jobs:
5555
matrix:
5656
python-version: ["3.10"]
5757
steps:
58-
- uses: actions/checkout@v2
58+
- uses: actions/checkout@v4
5959
with:
6060
submodules: recursive
6161
- name: Set up Python ${{ matrix.python-version }}
62-
uses: actions/setup-python@v2
62+
uses: actions/setup-python@v5
6363
with:
6464
python-version: ${{ matrix.python-version }}
6565
- name: Setup Build Env
@@ -71,7 +71,7 @@ jobs:
7171
runs-on: ubuntu-22.04
7272
timeout-minutes: 30
7373
steps:
74-
- uses: actions/checkout@v2
74+
- uses: actions/checkout@v4
7575
with:
7676
submodules: recursive
7777
- name: Setup Build Env
@@ -85,7 +85,7 @@ jobs:
8585
- name: Shorten SHA
8686
id: vars
8787
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
88-
- uses: actions/upload-artifact@v2
88+
- uses: actions/upload-artifact@v4
8989
if: ${{ !env.ACT }}
9090
name: Archive Test Results
9191
with:
@@ -98,7 +98,7 @@ jobs:
9898
name: doxygen
9999
runs-on: ubuntu-22.04
100100
steps:
101-
- uses: actions/checkout@v2
101+
- uses: actions/checkout@v4
102102
with:
103103
submodules: recursive
104104
- name: Install Doxygen
@@ -109,7 +109,7 @@ jobs:
109109
run: doxygen Doxyfile
110110
- name: Upload Docs artifacts
111111
if: ${{ !env.ACT }}
112-
uses: actions/upload-artifact@v2
112+
uses: actions/upload-artifact@v4
113113
with:
114114
name: OpenCBDC Transaction Processor docs for ${{ steps.vars.outputs.sha_short }}
115115
path: ./doxygen_generated/html/*

.github/workflows/docker-merge.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: docker merge
55
on:
66
push:
77
branches:
8-
- 'trunk'
8+
- trunk
99

1010
jobs:
1111
docker-build:
@@ -15,14 +15,14 @@ jobs:
1515
# CI Setup #
1616
########################
1717
- name: Checkout code
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919

2020
########################
2121
# Build Base #
2222
########################
2323
- name: Docker meta base (merge)
2424
id: meta-base
25-
uses: docker/metadata-action@v3
25+
uses: docker/metadata-action@v5
2626
with:
2727
# list of Docker images to use as base name for tags
2828
images: |
@@ -35,20 +35,20 @@ jobs:
3535
type=sha
3636
3737
- name: Set up QEMU (merge)
38-
uses: docker/setup-qemu-action@v1
38+
uses: docker/setup-qemu-action@v3
3939

4040
- name: Set up Docker Buildx (merge)
41-
uses: docker/setup-buildx-action@v1
41+
uses: docker/setup-buildx-action@v3
4242

4343
- name: Login to GitHub Container Registry (merge)
44-
uses: docker/login-action@v1
44+
uses: docker/login-action@v3
4545
with:
4646
registry: ghcr.io
4747
username: ${{ github.actor }}
4848
password: ${{ secrets.GITHUB_TOKEN }}
4949

5050
- name: Build and push base (merge)
51-
uses: docker/build-push-action@v2
51+
uses: docker/build-push-action@v6
5252
with:
5353
context: .
5454
target: base
@@ -69,7 +69,7 @@ jobs:
6969
########################
7070
- name: Docker meta twophase (merge)
7171
id: meta-twophase
72-
uses: docker/metadata-action@v3
72+
uses: docker/metadata-action@v5
7373
with:
7474
# list of Docker images to use as base name for tags
7575
images: |
@@ -83,7 +83,7 @@ jobs:
8383
8484
- name: Docker meta atomizer (merge)
8585
id: meta-atomizer
86-
uses: docker/metadata-action@v3
86+
uses: docker/metadata-action@v5
8787
with:
8888
# list of Docker images to use as base name for tags
8989
images: |
@@ -97,7 +97,7 @@ jobs:
9797
9898
- name: Docker meta parsec (merge)
9999
id: meta-parsec
100-
uses: docker/metadata-action@v3
100+
uses: docker/metadata-action@v5
101101
with:
102102
# list of Docker images to use as base name for tags
103103
images: |
@@ -111,7 +111,7 @@ jobs:
111111
112112
113113
- name: Build and push twophase (merge)
114-
uses: docker/build-push-action@v2
114+
uses: docker/build-push-action@v6
115115
with:
116116
context: .
117117
target: twophase
@@ -122,7 +122,7 @@ jobs:
122122
cache-to: type=gha,mode=max
123123

124124
- name: Build and push atomizer (merge)
125-
uses: docker/build-push-action@v2
125+
uses: docker/build-push-action@v6
126126
with:
127127
context: .
128128
target: atomizer
@@ -133,7 +133,7 @@ jobs:
133133
cache-to: type=gha,mode=max
134134

135135
- name: Build and push parsec (merge)
136-
uses: docker/build-push-action@v2
136+
uses: docker/build-push-action@v6
137137
with:
138138
context: .
139139
target: parsec

.github/workflows/docker-pull.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
# CI Setup #
1616
########################
1717
- name: Checkout code
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
fetch-depth: "2"
2121

2222
# For PRs, this action compares between the commit and trunk
2323
- name: Get specific changed files
2424
id: changed-files-specific
25-
uses: tj-actions/changed-files@v32
25+
uses: tj-actions/changed-files@v44
2626
with:
2727
files: |
2828
Dockerfile

.github/workflows/docker-push.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name: docker push
77
on:
88
push:
99
branches-ignore:
10-
- 'trunk'
10+
- trunk
1111

1212
jobs:
1313
docker-build:
@@ -17,7 +17,7 @@ jobs:
1717
# CI Setup #
1818
########################
1919
- name: Checkout code
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
########################
2323
# Build Base #

.github/workflows/pages.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ defaults:
1212
jobs:
1313
gh-pages-deploy:
1414
name: Github Pages Deploy
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-22.04
1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v4
1919
with:
2020
submodules: true
2121
fetch-depth: 0

src/parsec/runtime_locking_shard/state_machine.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ namespace cbdc::parsec::runtime_locking_shard {
8383
},
8484
[&](rpc::replicated_get_tickets_request /* msg */) {
8585
return m_shard->get_tickets(
86-
[&](replicated_shard::get_tickets_return_type res) {
86+
[&](const replicated_shard::get_tickets_return_type&
87+
res) {
8788
ret = res;
8889
});
8990
}},

0 commit comments

Comments
 (0)