Skip to content

Commit 2e8ad34

Browse files
leoparenteleoparente
authored
chore: update conan and GHA versions (#718)
1 parent 5695659 commit 2e8ad34

12 files changed

Lines changed: 108 additions & 111 deletions

File tree

‎.github/actions/build-cpp/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ WORKDIR /pktvisor-src
1515
RUN apt-get update && \
1616
apt-get upgrade --yes --force-yes && \
1717
apt-get install --yes --force-yes --no-install-recommends ${BUILD_DEPS} && \
18-
pip3 install 'conan==1.61.0' --force-reinstall
18+
pip3 install 'conan==1.64.1' --force-reinstall
1919

2020
RUN chmod +x /entrypoint.sh
2121

‎.github/workflows/build-develop.yml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
runs-on: macos-latest
2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030

3131
- name: Create Build Environment
3232
# Some projects don't allow in-source building, so create a separate build directory
@@ -42,13 +42,13 @@ jobs:
4242
id: conan
4343
uses: turtlebrowser/get-conan@main
4444
with:
45-
version: 1.61.0
45+
version: 1.64.1
4646

4747
- name: Setup OSX Environment
4848
run: echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
4949

5050
- name: Setup Conan Cache
51-
uses: actions/cache@v3
51+
uses: actions/cache@v4
5252
with:
5353
path: ${{github.workspace}}/build/conan_home/
5454
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
@@ -88,7 +88,7 @@ jobs:
8888
version_number: ${{ env.VERSION }}
8989
commit_hash: ${{ env.COMMIT }}
9090
steps:
91-
- uses: actions/checkout@v3
91+
- uses: actions/checkout@v4
9292

9393
- name: Create Build Environment
9494
# Some projects don't allow in-source building, so create a separate build directory
@@ -101,15 +101,15 @@ jobs:
101101
id: conan
102102
uses: turtlebrowser/get-conan@main
103103
with:
104-
version: 1.61.0
104+
version: 1.64.1
105105

106106
- name: linux package install
107107
run: |
108108
sudo apt-get update
109109
sudo apt-get install --yes --no-install-recommends jq
110110
111111
- name: Setup Conan Cache
112-
uses: actions/cache@v3
112+
uses: actions/cache@v4
113113
with:
114114
path: ${{github.workspace}}/build/conan_home/
115115
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
@@ -155,7 +155,7 @@ jobs:
155155
outputs:
156156
version_number: ${{ env.VERSION }}
157157
steps:
158-
- uses: actions/checkout@v3
158+
- uses: actions/checkout@v4
159159

160160
- name: Create Build Environment
161161
# Some projects don't allow in-source building, so create a separate build directory
@@ -168,15 +168,15 @@ jobs:
168168
id: conan
169169
uses: turtlebrowser/get-conan@main
170170
with:
171-
version: 1.61.0
171+
version: 1.64.1
172172

173173
- name: Remove libpcap from conanfile
174174
shell: bash
175175
run: |
176176
sed -i -e "s/libpcap.*//g" "${{github.workspace}}\conanfile.txt"
177177
178178
- name: Setup Conan Cache
179-
uses: actions/cache@v3
179+
uses: actions/cache@v4
180180
with:
181181
path: ${{github.workspace}}/build/conan_home/
182182
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
@@ -221,7 +221,7 @@ jobs:
221221
Get-ChildItem -Force ${{github.workspace}}\build\bin
222222
223223
- name: Persist to workspace
224-
uses: actions/upload-artifact@v2
224+
uses: actions/upload-artifact@v4
225225
with:
226226
name: windows-build
227227
path: |
@@ -235,10 +235,10 @@ jobs:
235235
runs-on: ubuntu-latest
236236
steps:
237237
- name: Checkout code
238-
uses: actions/checkout@v3
238+
uses: actions/checkout@v4
239239

240240
- name: Attach to workspace
241-
uses: actions/download-artifact@v3
241+
uses: actions/download-artifact@v4
242242
with:
243243
name: windows-build
244244

@@ -283,13 +283,13 @@ jobs:
283283
outputs:
284284
version_number: ${{ env.VERSION }}
285285
steps:
286-
- uses: actions/checkout@v3
286+
- uses: actions/checkout@v4
287287

288288
- name: Create Build Environment
289289
run: cmake -E make_directory ${{github.workspace}}/build
290290

291291
- name: Setup Conan Cache
292-
uses: actions/cache@v3
292+
uses: actions/cache@v4
293293
with:
294294
path: ${{github.workspace}}/build/conan_home/
295295
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
@@ -331,14 +331,14 @@ jobs:
331331
run: echo ${{ env.REF_TAG }}
332332

333333
- name: Login to GitHub Container Registry
334-
uses: docker/login-action@v1
334+
uses: docker/login-action@v3
335335
with:
336336
registry: ghcr.io
337337
username: ${{ github.repository_owner }}
338338
password: ${{ secrets.GITHUB_TOKEN }}
339339

340340
- name: Login to Docker Hub
341-
uses: docker/login-action@v1
341+
uses: docker/login-action@v3
342342
with:
343343
username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
344344
password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
@@ -389,7 +389,7 @@ jobs:
389389
runs-on: ubuntu-latest
390390
#if: github.event_name != 'pull_request'
391391
steps:
392-
- uses: actions/checkout@v3
392+
- uses: actions/checkout@v4
393393

394394
- name: Create Build Environment
395395
run: cmake -E make_directory ${{github.workspace}}/build
@@ -398,7 +398,7 @@ jobs:
398398
id: conan
399399
uses: turtlebrowser/get-conan@main
400400
with:
401-
version: 1.61.0
401+
version: 1.64.1
402402

403403
- name: Configure CMake to generate VERSION
404404
shell: bash
@@ -440,13 +440,13 @@ jobs:
440440
- name: Upload pktvisor-cli artifact
441441
env:
442442
BINARY_NAME: pktvisor-cli-linux-x86_64-${{ env.VERSION }}
443-
uses: actions/upload-artifact@v2
443+
uses: actions/upload-artifact@v4
444444
with:
445445
name: ${{ env.BINARY_NAME }}
446446
path: ${{github.workspace}}/${{ env.BINARY_NAME }}
447447

448448
- name: Login to Docker Hub
449-
uses: docker/login-action@v1
449+
uses: docker/login-action@v3
450450
with:
451451
username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
452452
password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
@@ -468,7 +468,7 @@ jobs:
468468
mv pktvisor-x86_64.AppImage pktvisor-x86_64-${{ env.VERSION }}.AppImage
469469
470470
- name: Upload AppImage artifact
471-
uses: actions/upload-artifact@v2
471+
uses: actions/upload-artifact@v4
472472
with:
473473
name: pktvisor-x86_64-${{ env.VERSION }}.AppImage
474474
path: ${{github.workspace}}/appimage/pktvisor-x86_64-${{ env.VERSION }}.AppImage
@@ -493,7 +493,7 @@ jobs:
493493
if: github.event_name != 'pull_request'
494494
steps:
495495
- name: Checkout
496-
uses: actions/checkout@v3
496+
uses: actions/checkout@v4
497497

498498
- name: Generate runner token
499499
id: token
@@ -553,15 +553,15 @@ jobs:
553553
terraform output -raw ip > ip.txt
554554
555555
- name: Persist IP to workspace
556-
uses: actions/upload-artifact@v2
556+
uses: actions/upload-artifact@v4
557557
with:
558558
name: ip
559559
path: |
560560
.github/hosted-runner/amd64/ip.txt
561561
retention-days: 1
562562

563563
- name: Persist to workspace
564-
uses: actions/upload-artifact@v2
564+
uses: actions/upload-artifact@v4
565565
with:
566566
name: terraform
567567
path: |
@@ -577,7 +577,7 @@ jobs:
577577
if: github.event_name != 'pull_request'
578578
steps:
579579
- uses: AutoModality/action-clean@v1
580-
- uses: actions/checkout@v3
580+
- uses: actions/checkout@v4
581581

582582
- name: Locking pktvisor integration test state
583583
run: |
@@ -618,7 +618,7 @@ jobs:
618618
echo ${{ needs.package-amd64.outputs.version_number }} > ./automated_tests/output/VERSION
619619
620620
- name: Persist to workspace
621-
uses: actions/upload-artifact@v2
621+
uses: actions/upload-artifact@v4
622622
with:
623623
name: workspace
624624
path: |
@@ -636,7 +636,7 @@ jobs:
636636
if: github.event_name != 'pull_request'
637637
steps:
638638
- name: Attach to workspace
639-
uses: actions/download-artifact@v2
639+
uses: actions/download-artifact@v4
640640
with:
641641
name: workspace
642642

@@ -661,7 +661,7 @@ jobs:
661661
if: github.event_name != 'pull_request'
662662
steps:
663663
- name: Attach to workspace
664-
uses: actions/download-artifact@v2
664+
uses: actions/download-artifact@v4
665665
with:
666666
name: ip
667667

@@ -689,10 +689,10 @@ jobs:
689689
if: github.event_name != 'pull_request'
690690
steps:
691691
- name: Checkout
692-
uses: actions/checkout@v3
692+
uses: actions/checkout@v4
693693

694694
- name: Attach to workspace
695-
uses: actions/download-artifact@v2
695+
uses: actions/download-artifact@v4
696696
with:
697697
name: terraform
698698
path: .github/hosted-runner/amd64/
@@ -734,7 +734,7 @@ jobs:
734734
if: github.event_name != 'pull_request'
735735
steps:
736736
- name: Checkout
737-
uses: actions/checkout@v3
737+
uses: actions/checkout@v4
738738

739739
- name: Get branch name
740740
shell: bash
@@ -797,15 +797,15 @@ jobs:
797797
terraform output -raw ip > ip.txt
798798
799799
- name: Persist IP to workspace
800-
uses: actions/upload-artifact@v2
800+
uses: actions/upload-artifact@v4
801801
with:
802802
name: ip-arm
803803
path: |
804804
.github/hosted-runner/arm64/ip.txt
805805
retention-days: 1
806806

807807
- name: Persist to workspace
808-
uses: actions/upload-artifact@v2
808+
uses: actions/upload-artifact@v4
809809
with:
810810
name: terraform2
811811
path: |
@@ -822,13 +822,13 @@ jobs:
822822
sudo chown -R $USER:$USER $GITHUB_WORKSPACE
823823
824824
- name: Checkout
825-
uses: actions/checkout@v3
825+
uses: actions/checkout@v4
826826

827827
- name: Create Build Environment
828828
run: cmake -E make_directory ${{github.workspace}}/build
829829

830830
- name: Setup Conan Cache
831-
uses: actions/cache@v3
831+
uses: actions/cache@v4
832832
with:
833833
path: ${{github.workspace}}/build/conan_home/
834834
key: conan-${{ runner.os }}-arm64-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
@@ -863,7 +863,7 @@ jobs:
863863
echo "DRAFT=true" >> $GITHUB_ENV
864864
865865
- name: Login to GitHub Container Registry
866-
uses: docker/login-action@v1
866+
uses: docker/login-action@v3
867867
with:
868868
registry: ghcr.io
869869
username: ${{ github.repository_owner }}
@@ -914,7 +914,7 @@ jobs:
914914
if: github.event_name != 'pull_request'
915915
steps:
916916
- name: Attach to workspace
917-
uses: actions/download-artifact@v2
917+
uses: actions/download-artifact@v4
918918
with:
919919
name: ip-arm
920920

@@ -942,10 +942,10 @@ jobs:
942942
if: github.event_name != 'pull_request'
943943
steps:
944944
- name: Checkout
945-
uses: actions/checkout@v3
945+
uses: actions/checkout@v4
946946

947947
- name: Attach to workspace
948-
uses: actions/download-artifact@v2
948+
uses: actions/download-artifact@v4
949949
with:
950950
name: terraform2
951951
path: .github/hosted-runner/arm64/
@@ -985,7 +985,7 @@ jobs:
985985
if: github.event_name != 'pull_request'
986986
steps:
987987
- name: Login to GitHub Container Registry
988-
uses: docker/login-action@v1
988+
uses: docker/login-action@v3
989989
with:
990990
registry: ghcr.io
991991
username: ${{ github.repository_owner }}

0 commit comments

Comments
 (0)