Skip to content

Commit 93bd544

Browse files
authored
chore: backport fixes from main (#1139)
# Motivation Backport fixes from main. # Description Merge main branch into releases/0.34.x with #1137 #699 #1108 #1111 reverted. # Testing Pipeline is working.
2 parents a1c0d71 + e1fa7d6 commit 93bd544

456 files changed

Lines changed: 1886 additions & 879 deletions

File tree

Some content is hidden

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

.github/workflows/build.yml

Lines changed: 338 additions & 156 deletions
Large diffs are not rendered by default.

.github/workflows/code-formatting.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
11
name: Code Formatting
22

33
on:
4+
push:
5+
branches:
6+
- main
7+
- releases/*
48
pull_request:
9+
branches:
10+
- main
11+
- releases/*
512

613
jobs:
714
format-csharp:
815
runs-on: ubuntu-latest
916
timeout-minutes: 15
1017
steps:
1118
- name: Checkout
12-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
19+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
1320
with:
14-
ref: ${{ github.ref }}
21+
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
22+
ref: ${{ github.head_ref || github.ref }}
1523

1624
- name: Install .NET Core
17-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4
25+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5
1826
with:
1927
dotnet-version: 8.x
2028

@@ -50,7 +58,7 @@ jobs:
5058
run: |
5159
git diff > patch-csharp.diff
5260
53-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
61+
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
5462
if: ${{ failure() && steps.check-diff.conclusion == 'failure' }}
5563
with:
5664
name: patch-csharp
@@ -60,9 +68,10 @@ jobs:
6068
runs-on: ubuntu-latest
6169
steps:
6270
- name: Checkout
63-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
71+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
6472
with:
65-
ref: ${{ github.ref }}
73+
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
74+
ref: ${{ github.head_ref || github.ref }}
6675

6776
- name: Setup Terraform
6877
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3
@@ -77,9 +86,10 @@ jobs:
7786
runs-on: ubuntu-latest
7887
steps:
7988
- name: Checkout
80-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
89+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
8190
with:
82-
ref: ${{ github.ref }}
91+
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
92+
ref: ${{ github.head_ref || github.ref }}
8393

8494
- name: Set files mode to 644
8595
run: git grep -l "" | grep -v -E "\.sh$" | xargs chmod 644

.github/workflows/make-release.yml

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ jobs:
1616
release: ${{ steps.release.outputs.version }}
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
19+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
2020
with:
21-
ref: ${{ github.ref }}
2221
fetch-depth: 0
2322

2423
- name: Remove tag locally
@@ -81,16 +80,14 @@ jobs:
8180
- worker=htcmock buildWorker
8281
steps:
8382
- name: Checkout
84-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
85-
with:
86-
ref: ${{ github.ref }}
83+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
8784

8885
- name: Set up Docker Buildx
8986
id: buildx
9087
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
9188

9289
- name: Setup just
93-
uses: taiki-e/install-action@bf2f998095ccb464eb8b85eeb95a460ccd744ec4 # v2
90+
uses: taiki-e/install-action@7646916979096be288829d3d80a5e43636357a04 # v2
9491
with:
9592
tool: just
9693

@@ -109,9 +106,7 @@ jobs:
109106
VERSION: ${{ github.ref_name }}
110107
steps:
111108
- name: Checkout
112-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
113-
with:
114-
ref: ${{ github.ref }}
109+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
115110

116111
- name: Build the package
117112
run: |
@@ -124,20 +119,3 @@ jobs:
124119
- name: Push the package
125120
run: dotnet nuget push /tmp/packages/ArmoniK.Core.*.nupkg -k ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
126121

127-
128-
update-changelog:
129-
runs-on: ubuntu-latest
130-
needs:
131-
- versionning
132-
steps:
133-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
134-
with:
135-
fetch-depth: 0
136-
137-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
138-
with:
139-
node-version: 18
140-
141-
- run: npx @aneoconsultingfr/order-github-release-notes
142-
env:
143-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/manual-integration-test.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ jobs:
1010
version: ${{ steps.genver.outputs.version }}
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
13+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
1414
with:
15-
ref: ${{ github.ref }}
1615
fetch-depth: 0
1716

1817
- name: Generate Version
@@ -28,10 +27,7 @@ jobs:
2827
runs-on: ubuntu-latest
2928
steps:
3029
- name: Checkout
31-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
32-
with:
33-
ref: ${{ github.ref }}
34-
submodules: true
30+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
3531

3632
- uses: aneoconsulting/ArmoniK@main
3733
id: deploy-infra
@@ -73,7 +69,7 @@ jobs:
7369
find /tmp/armoniklogs -name "*.log"
7470
7571
- name: Store logs
76-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
72+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
7773
if: always()
7874
with:
7975
name: Logs Stream
@@ -88,10 +84,7 @@ jobs:
8884
runs-on: ubuntu-latest
8985
steps:
9086
- name: Checkout
91-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
92-
with:
93-
ref: ${{ github.ref }}
94-
submodules: true
87+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
9588

9689
- uses: aneoconsulting/ArmoniK@main
9790
id: deploy-infra
@@ -124,7 +117,7 @@ jobs:
124117
find /tmp/armoniklogs -name "*.log"
125118
126119
- name: Store logs
127-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
120+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
128121
if: always()
129122
with:
130123
name: Logs HtcMock

.github/workflows/manual-test.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,14 @@ jobs:
2323
runs-on: ${{ matrix.os }}
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
27-
with:
28-
ref: ${{ github.ref }}
29-
submodules: true
26+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
3027

3128
- name: Install AWSCLI (the one in the Github runner does not work)
3229
run: |
3330
pip install awscli
3431
3532
- name: Setup just
36-
uses: taiki-e/install-action@bf2f998095ccb464eb8b85eeb95a460ccd744ec4 # v2
33+
uses: taiki-e/install-action@7646916979096be288829d3d80a5e43636357a04 # v2
3734
with:
3835
tool: just
3936

@@ -93,10 +90,7 @@ jobs:
9390
runs-on: ${{ matrix.os }}
9491
steps:
9592
- name: Checkout
96-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
97-
with:
98-
ref: ${{ github.ref }}
99-
submodules: true
93+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
10094

10195
- name: Install AWSCLI (the one in the Github runner does not work)
10296
run: |
@@ -155,10 +149,7 @@ jobs:
155149
runs-on: windows-latest
156150
steps:
157151
- name: Checkout
158-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
159-
with:
160-
ref: ${{ github.ref }}
161-
submodules: true
152+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
162153

163154
- name: Dotnet Restore
164155
run: |
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Remove Old Branch Artefacts
2+
3+
on:
4+
schedule:
5+
- cron: '10 9 * * 1' # 9:10 on Monday
6+
workflow_dispatch:
7+
8+
jobs:
9+
images:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
image:
15+
- pollingagent
16+
- control_metrics
17+
- control_partition_metrics
18+
- control
19+
- core_stream_test_worker
20+
- core_stream_test_client
21+
- core_htcmock_test_worker
22+
- core_htcmock_test_client
23+
- core_bench_test_worker
24+
- core_bench_test_client
25+
steps:
26+
- name: Checkout
27+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
28+
29+
- name: Set up Python
30+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6
31+
32+
- name: Install dependencies
33+
run: pip install requests
34+
35+
- name: Remove old branch images
36+
run: python tools/remove_images.py dockerhubaneo "armonik_${{ matrix.image }}" "${{ secrets.DOCKER_HUB_LOGIN }}" "${{ secrets.DOCKER_HUB_TOKEN }}"
37+
38+
nugets:
39+
runs-on: ubuntu-latest
40+
strategy:
41+
fail-fast: false
42+
matrix:
43+
nuget:
44+
- ArmoniK.Core.Base
45+
steps:
46+
- name: Checkout
47+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
48+
49+
- name: Set up Python
50+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6
51+
52+
- name: Install dependencies
53+
run: pip install requests
54+
55+
- name: Unlist old branch nugets
56+
run: python tools/unlist_nugets.py "${{ matrix.nuget }}" "${{ secrets.NUGET_API_KEY }}"

.github/workflows/scout-cron.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
outputs:
1212
releases: ${{ steps.releases.outputs.releases }}
1313
steps:
14-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
14+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
1515
- name: List last releases
1616
id: releases
1717
run: echo "releases=$(gh release list -L 3 --json tagName -q '[ .[].tagName ]')" >> "$GITHUB_OUTPUT"

.github/workflows/semantic-pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Validate PR title
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: amannn/action-semantic-pull-request@e32d7e603df1aa1ba07e981f2a23455dee596825 # v5
20+
- uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6
2121
id: lint_pr_title
2222
env:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonar.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,44 @@ name: Sonar Analysis
22

33
on:
44
push:
5-
branches-ignore:
6-
- release
5+
branches:
6+
- main
7+
- releases/*
78
paths-ignore:
89
- .github
910
- .docs
1011
- terraform
1112
tags-ignore: [ '**' ]
13+
pull_request:
14+
branches:
15+
- main
16+
- releases/*
1217

1318
jobs:
1419
sonarCloud:
1520
runs-on: windows-latest
1621
steps:
1722
- name: Set up JDK
18-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
23+
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5
1924
with:
2025
distribution: 'zulu'
2126
java-version: 17
22-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
27+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
2328
with:
29+
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
30+
ref: ${{ github.head_ref || github.ref }}
2431
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2532
submodules: true
2633

2734
- name: Cache SonarCloud packages
28-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
35+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
2936
with:
3037
path: .\.sonar\cache
3138
key: ${{ runner.os }}-sonar
3239
restore-keys: ${{ runner.os }}-sonar
3340
- name: Cache SonarCloud scanner
3441
id: cache-sonar-scanner
35-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
42+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
3643
with:
3744
path: .\.sonar\scanner
3845
key: ${{ runner.os }}-sonar-scanner

Adaptors/Amqp/src/ConnectionAmqp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This file is part of the ArmoniK project
22
//
3-
// Copyright (C) ANEO, 2021-2025. All rights reserved.
3+
// Copyright (C) ANEO, 2021-2026. All rights reserved.
44
//
55
// This program is free software: you can redistribute it and/or modify
66
// it under the terms of the GNU Affero General Public License as published

0 commit comments

Comments
 (0)