Skip to content

Commit af5f61d

Browse files
authored
update docker slave name and switch to using libboost1.83 (#88)
* update docker slave name and switch to using libboost1.83 Signed-off-by: yijingyan2 <yijingyan@microsoft.com> * fix CodeQL Signed-off-by: yijingyan2 <yijingyan@microsoft.com> --------- Signed-off-by: yijingyan2 <yijingyan@microsoft.com>
1 parent f908c85 commit af5f61d

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

.azure-pipelines/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
set -ex
3434
sudo apt-get update
3535
sudo apt-get install -y \
36-
libboost-system-dev \
37-
libboost-thread-dev \
38-
libboost-serialization-dev \
36+
libboost-system1.83-dev \
37+
libboost-thread1.83-dev \
38+
libboost-serialization1.83-dev \
3939
googletest \
4040
libgtest-dev \
4141
libgmock-dev \

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
- name: prepare
4141
run: |
4242
sudo apt-get update
43-
sudo apt-get install -y libboost-system-dev \
44-
libboost-thread-dev \
43+
sudo apt-get install -y libboost-system1.83-dev \
44+
libboost-thread1.83-dev \
4545
libevent-dev \
4646
libhiredis-dev \
4747
libnl-3-dev \

azure-pipelines.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,29 @@ trigger:
88
include:
99
- "*"
1010

11+
variables:
12+
- name: BUILD_BRANCH
13+
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
14+
value: $(System.PullRequest.TargetBranch)
15+
${{ else }}:
16+
value: $(Build.SourceBranchName)
17+
1118
jobs:
1219
- template: .azure-pipelines/build.yml
1320
parameters:
1421
arch: amd64
1522
pool:
1623
vmImage: 'ubuntu-latest'
1724
codeCoverage: true
18-
containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:latest
25+
containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:$(BUILD_BRANCH)
1926
- template: .azure-pipelines/build.yml
2027
parameters:
2128
arch: arm64
2229
pool: sonicso1ES-arm64
23-
containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm-arm64:latest
30+
containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:$(BUILD_BRANCH)-arm64
2431
- template: .azure-pipelines/build.yml
2532
parameters:
2633
arch: armhf
2734
pool: sonicso1ES-armhf
28-
containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm-armhf:latest
35+
containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:$(BUILD_BRANCH)-armhf
2936

0 commit comments

Comments
 (0)