Skip to content

Commit 91f62cc

Browse files
aneojgurhemaneojgurhem
authored
feat: use .Net8.0 (#570)
2 parents 8425333 + aa56c43 commit 91f62cc

File tree

46 files changed

+202
-398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+202
-398
lines changed

‎.docs/content/1.concepts/7.plugins.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This is an example of docker file that allows you to build a new image consistin
2323

2424
```dockerfile
2525

26-
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS mypluginimage
26+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS mypluginimage
2727
WORKDIR /src
2828
COPY . .
2929
WORKDIR "/src/MyPlugin/"

‎.github/workflows/build.yml

+21-172
Original file line numberDiff line numberDiff line change
@@ -207,44 +207,8 @@ jobs:
207207
- name: Push the package
208208
run: dotnet nuget push /tmp/packages/ArmoniK.Core.*.nupkg -k ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
209209

210-
imagesCore:
211-
runs-on: ubuntu-latest
212-
needs:
213-
- versionning
214-
- buildProjects
215-
env:
216-
VERSION: ${{ needs.versionning.outputs.version }}
217-
steps:
218-
- name: Checkout
219-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
220-
with:
221-
ref: ${{ github.ref }}
222-
submodules: true
223-
224-
- name: Setup just
225-
run: |
226-
sudo snap install --edge --classic just
227-
228-
- name: login
229-
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_LOGIN }} --password-stdin
230210

231-
- name: Build
232-
run: |
233-
just tag=$VERSION build-core
234-
235-
- name: push
236-
run: |
237-
while IFS= read -r IMG
238-
do
239-
docker push $IMG:${VERSION}
240-
done <<-EOF
241-
dockerhubaneo/armonik_control
242-
dockerhubaneo/armonik_control_partition_metrics
243-
dockerhubaneo/armonik_control_metrics
244-
dockerhubaneo/armonik_pollingagent
245-
EOF
246-
247-
imagesRe:
211+
images:
248212
runs-on: ubuntu-latest
249213
needs:
250214
- versionning
@@ -254,149 +218,40 @@ jobs:
254218
strategy:
255219
fail-fast: true
256220
matrix:
257-
include:
258-
- img : dockerhubaneo/armonik_core_stream_test_worker
259-
path: ./Tests/Stream/Server/Dockerfile
260-
- img : dockerhubaneo/armonik_core_stream_test_client
261-
path: ./Tests/Stream/Client/Dockerfile
262-
- img : dockerhubaneo/armonik_core_htcmock_test_worker
263-
path: ./Tests/HtcMock/Server/src/Dockerfile
264-
- img : dockerhubaneo/armonik_core_htcmock_test_client
265-
path: ./Tests/HtcMock/Client/src/Dockerfile
266-
- img : dockerhubaneo/armonik_core_bench_test_worker
267-
path: ./Tests/Bench/Server/src/Dockerfile
268-
- img : dockerhubaneo/armonik_core_bench_test_client
269-
path: ./Tests/Bench/Client/src/Dockerfile
221+
type:
222+
- build-core
223+
- buildBenchClient
224+
- worker=bench buildWorker
225+
- buildStreamClient
226+
- worker=stream buildWorker
227+
- buildHtcmockClient
228+
- worker=htcmock buildWorker
270229
steps:
271230
- name: Checkout
272231
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
273232
with:
274233
ref: ${{ github.ref }}
275-
submodules: true
276234

277-
- name: login
278-
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_LOGIN }} --password-stdin
279-
280-
- name: Build
281-
run: docker build --build-arg VERSION=$VERSION -t ${{ matrix.img }}:$VERSION -f ${{ matrix.path }} .
282-
283-
- name: push
284-
run: docker push ${{ matrix.img }}:$VERSION
285-
286-
imagesCoreC:
287-
if: github.ref == 'refs/heads/main'
288-
runs-on: ubuntu-latest
289-
needs:
290-
- versionning
291-
- imagesCore
292-
env:
293-
VERSION: ${{ needs.versionning.outputs.version }}
294-
steps:
295-
- name: Checkout
296-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
297-
with:
298-
ref: ${{ github.ref }}
299-
submodules: true
235+
- name: Set up Docker Buildx
236+
id: buildx
237+
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
300238

301239
- name: Setup just
302240
run: |
303241
sudo snap install --edge --classic just
304242
305-
- name: Set up QEMU
306-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
307-
308-
- name: Set up Docker Buildx
309-
id: buildx
310-
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
311-
312243
- name: login
313-
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
314-
with:
315-
username: ${{ secrets.DOCKER_HUB_LOGIN }}
316-
password: ${{ secrets.DOCKER_HUB_TOKEN }}
244+
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_LOGIN }} --password-stdin
317245

318246
- name: Build
319-
run: just tag=${VERSION}-arm builder=buildx build-core
320-
321-
- name: Rename
322247
run: |
323-
while IFS= read -r IMG
324-
do
325-
docker buildx imagetools create $IMG:${VERSION} --tag $IMG:${VERSION} --append $IMG:${VERSION}-arm
326-
done <<-EOF
327-
dockerhubaneo/armonik_control
328-
dockerhubaneo/armonik_control_partition_metrics
329-
dockerhubaneo/armonik_control_metrics
330-
dockerhubaneo/armonik_pollingagent
331-
EOF
332-
333-
imagesReC:
334-
if: github.ref == 'refs/heads/main'
335-
runs-on: ubuntu-latest
336-
needs:
337-
- versionning
338-
- imagesRe
339-
env:
340-
VERSION: ${{ needs.versionning.outputs.version }}
341-
strategy:
342-
fail-fast: false
343-
matrix:
344-
include:
345-
- img : dockerhubaneo/armonik_core_stream_test_worker
346-
path: ./Tests/Stream/Server/Dockerfile
347-
- img : dockerhubaneo/armonik_core_stream_test_client
348-
path: ./Tests/Stream/Client/Dockerfile
349-
- img : dockerhubaneo/armonik_core_htcmock_test_worker
350-
path: ./Tests/HtcMock/Server/src/Dockerfile
351-
- img : dockerhubaneo/armonik_core_htcmock_test_client
352-
path: ./Tests/HtcMock/Client/src/Dockerfile
353-
- img : dockerhubaneo/armonik_core_bench_test_worker
354-
path: ./Tests/Bench/Server/src/Dockerfile
355-
- img : dockerhubaneo/armonik_core_bench_test_client
356-
path: ./Tests/Bench/Client/src/Dockerfile
357-
steps:
358-
- name: Checkout
359-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
360-
with:
361-
ref: ${{ github.ref }}
362-
submodules: true
248+
just tag=$VERSION platform=linux/arm64,linux/amd64 load=false push=true ${{ matrix.type }}
363249
364-
- name: Set up QEMU
365-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
366-
367-
- name: Set up Docker Buildx
368-
id: buildx
369-
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
370-
371-
- name: login
372-
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
373-
with:
374-
username: ${{ secrets.DOCKER_HUB_LOGIN }}
375-
password: ${{ secrets.DOCKER_HUB_TOKEN }}
376-
377-
- name: platforms
378-
run: echo ${{ steps.buildx.outputs.platforms }}
379-
380-
- name: Build and push
381-
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
382-
with:
383-
file: ${{ matrix.path }}
384-
context: .
385-
platforms: linux/arm64
386-
build-args: |
387-
VERSION=${{ needs.versionning.outputs.version }}
388-
push: true
389-
tags: |
390-
${{ matrix.img }}:${{ needs.versionning.outputs.version }}-arm
391-
392-
- name: Create multi-arch manifest
393-
run: docker buildx imagetools create ${{ matrix.img }}:${VERSION} --tag ${{ matrix.img }}:${VERSION} --append ${{ matrix.img }}:${VERSION}-arm
394250
395251
testStreamDC:
396252
needs:
397253
- versionning
398-
- imagesCore
399-
- imagesRe
254+
- images
400255
env:
401256
VERSION: ${{ needs.versionning.outputs.version }}
402257
runs-on: ubuntu-latest
@@ -481,8 +336,7 @@ jobs:
481336
testHtcMockDC:
482337
needs:
483338
- versionning
484-
- imagesCore
485-
- imagesRe
339+
- images
486340
env:
487341
VERSION: ${{ needs.versionning.outputs.version }}
488342
runs-on: ubuntu-latest
@@ -655,8 +509,7 @@ jobs:
655509
testConnectivity:
656510
needs:
657511
- versionning
658-
- imagesCore
659-
- imagesRe
512+
- images
660513
env:
661514
VERSION: ${{ needs.versionning.outputs.version }}
662515
runs-on: ubuntu-latest
@@ -739,8 +592,7 @@ jobs:
739592
runBench:
740593
needs:
741594
- versionning
742-
- imagesCore
743-
- imagesRe
595+
- images
744596
env:
745597
VERSION: ${{ needs.versionning.outputs.version }}
746598
runs-on: ubuntu-latest
@@ -848,8 +700,7 @@ jobs:
848700
defaultPartitionMock:
849701
needs:
850702
- versionning
851-
- imagesCore
852-
- imagesRe
703+
- images
853704
env:
854705
VERSION: ${{ needs.versionning.outputs.version }}
855706
runs-on: ubuntu-latest
@@ -921,8 +772,7 @@ jobs:
921772
healthCheckTest:
922773
needs:
923774
- versionning
924-
- imagesCore
925-
- imagesRe
775+
- images
926776
env:
927777
VERSION: ${{ needs.versionning.outputs.version }}
928778
runs-on: ubuntu-latest
@@ -1068,8 +918,7 @@ jobs:
1068918
- testHtcMockDC
1069919
- defaultPartitionMock
1070920
- testStreamDC
1071-
- imagesCore
1072-
- imagesRe
921+
- images
1073922
- runBench
1074923
- healthCheckTest
1075924
- testConnectivity

‎.github/workflows/make-release.yml

+16-65
Original file line numberDiff line numberDiff line change
@@ -62,91 +62,42 @@ jobs:
6262
run : git push origin -d ${{ github.ref_name }}
6363

6464

65-
imagesCore:
65+
images:
6666
runs-on: ubuntu-latest
6767
needs:
6868
- versionning
6969
env:
7070
VERSION: ${{ needs.versionning.outputs.release }}
71-
steps:
72-
- name: Checkout
73-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
74-
with:
75-
ref: ${{ github.ref }}
76-
submodules: true
77-
78-
- name: Setup just
79-
run: |
80-
sudo snap install --edge --classic just
81-
82-
- name: login
83-
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_LOGIN }} --password-stdin
84-
85-
- name: Create builder
86-
run: |
87-
docker buildx create --use
88-
89-
- name: Build
90-
run: |
91-
just tag=$VERSION builder=buildx platform="linux/arm64,linux/amd64" build-core
92-
93-
94-
buildImages:
95-
runs-on: ubuntu-latest
96-
needs:
97-
- versionning
9871
strategy:
99-
fail-fast: false
72+
fail-fast: true
10073
matrix:
101-
include:
102-
- img : dockerhubaneo/armonik_core_stream_test_worker
103-
path: ./Tests/Stream/Server/Dockerfile
104-
- img : dockerhubaneo/armonik_core_stream_test_client
105-
path: ./Tests/Stream/Client/Dockerfile
106-
- img : dockerhubaneo/armonik_core_htcmock_test_worker
107-
path: ./Tests/HtcMock/Server/src/Dockerfile
108-
- img : dockerhubaneo/armonik_core_htcmock_test_client
109-
path: ./Tests/HtcMock/Client/src/Dockerfile
110-
- img : dockerhubaneo/armonik_core_bench_test_worker
111-
path: ./Tests/Bench/Server/src/Dockerfile
112-
- img : dockerhubaneo/armonik_core_bench_test_client
113-
path: ./Tests/Bench/Client/src/Dockerfile
74+
type:
75+
- build-core
76+
- buildBenchClient
77+
- worker=bench buildWorker
78+
- buildStreamClient
79+
- worker=stream buildWorker
80+
- buildHtcmockClient
81+
- worker=htcmock buildWorker
11482
steps:
11583
- name: Checkout
11684
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
11785
with:
11886
ref: ${{ github.ref }}
119-
submodules: true
120-
121-
- name: Set up QEMU
122-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
12387

12488
- name: Set up Docker Buildx
12589
id: buildx
12690
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
12791

92+
- name: Setup just
93+
run: sudo snap install --edge --classic just
94+
12895
- name: login
129-
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
130-
with:
131-
username: ${{ secrets.DOCKER_HUB_LOGIN }}
132-
password: ${{ secrets.DOCKER_HUB_TOKEN }}
96+
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_LOGIN }} --password-stdin
13397

134-
- name: platforms
135-
run: echo ${{ steps.buildx.outputs.platforms }}
98+
- name: Build
99+
run: just tag=$VERSION platform=linux/arm64,linux/amd64 load=false push=true ${{ matrix.type }}
136100

137-
- name: Build and push
138-
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
139-
with:
140-
file: ${{ matrix.path }}
141-
context: .
142-
platforms: |
143-
linux/arm64
144-
linux/amd64
145-
build-args: |
146-
VERSION=${{ needs.versionning.outputs.release }}
147-
push: true
148-
tags: |
149-
${{ matrix.img }}:${{ needs.versionning.outputs.release }}
150101

151102
publish-nuget:
152103
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)