Skip to content

Commit

Permalink
chore: update conan and GHA versions (#718)
Browse files Browse the repository at this point in the history
  • Loading branch information
leoparente authored Aug 9, 2024
1 parent 5695659 commit 2e8ad34
Show file tree
Hide file tree
Showing 12 changed files with 108 additions and 111 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-cpp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ WORKDIR /pktvisor-src
RUN apt-get update && \
apt-get upgrade --yes --force-yes && \
apt-get install --yes --force-yes --no-install-recommends ${BUILD_DEPS} && \
pip3 install 'conan==1.61.0' --force-reinstall
pip3 install 'conan==1.64.1' --force-reinstall

RUN chmod +x /entrypoint.sh

Expand Down
80 changes: 40 additions & 40 deletions .github/workflows/build-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

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

- name: Setup Conan Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{github.workspace}}/build/conan_home/
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
version_number: ${{ env.VERSION }}
commit_hash: ${{ env.COMMIT }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- name: linux package install
run: |
sudo apt-get update
sudo apt-get install --yes --no-install-recommends jq
- name: Setup Conan Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{github.workspace}}/build/conan_home/
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
outputs:
version_number: ${{ env.VERSION }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- name: Remove libpcap from conanfile
shell: bash
run: |
sed -i -e "s/libpcap.*//g" "${{github.workspace}}\conanfile.txt"
- name: Setup Conan Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{github.workspace}}/build/conan_home/
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
Get-ChildItem -Force ${{github.workspace}}\build\bin
- name: Persist to workspace
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: windows-build
path: |
Expand All @@ -235,10 +235,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Attach to workspace
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: windows-build

Expand Down Expand Up @@ -283,13 +283,13 @@ jobs:
outputs:
version_number: ${{ env.VERSION }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

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

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Login to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
Expand Down Expand Up @@ -389,7 +389,7 @@ jobs:
runs-on: ubuntu-latest
#if: github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{github.workspace}}/build
Expand All @@ -398,7 +398,7 @@ jobs:
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.61.0
version: 1.64.1

- name: Configure CMake to generate VERSION
shell: bash
Expand Down Expand Up @@ -440,13 +440,13 @@ jobs:
- name: Upload pktvisor-cli artifact
env:
BINARY_NAME: pktvisor-cli-linux-x86_64-${{ env.VERSION }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ${{ env.BINARY_NAME }}
path: ${{github.workspace}}/${{ env.BINARY_NAME }}

- name: Login to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
Expand All @@ -468,7 +468,7 @@ jobs:
mv pktvisor-x86_64.AppImage pktvisor-x86_64-${{ env.VERSION }}.AppImage
- name: Upload AppImage artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: pktvisor-x86_64-${{ env.VERSION }}.AppImage
path: ${{github.workspace}}/appimage/pktvisor-x86_64-${{ env.VERSION }}.AppImage
Expand All @@ -493,7 +493,7 @@ jobs:
if: github.event_name != 'pull_request'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Generate runner token
id: token
Expand Down Expand Up @@ -553,15 +553,15 @@ jobs:
terraform output -raw ip > ip.txt
- name: Persist IP to workspace
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ip
path: |
.github/hosted-runner/amd64/ip.txt
retention-days: 1

- name: Persist to workspace
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: terraform
path: |
Expand All @@ -577,7 +577,7 @@ jobs:
if: github.event_name != 'pull_request'
steps:
- uses: AutoModality/action-clean@v1
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Locking pktvisor integration test state
run: |
Expand Down Expand Up @@ -618,7 +618,7 @@ jobs:
echo ${{ needs.package-amd64.outputs.version_number }} > ./automated_tests/output/VERSION
- name: Persist to workspace
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: workspace
path: |
Expand All @@ -636,7 +636,7 @@ jobs:
if: github.event_name != 'pull_request'
steps:
- name: Attach to workspace
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: workspace

Expand All @@ -661,7 +661,7 @@ jobs:
if: github.event_name != 'pull_request'
steps:
- name: Attach to workspace
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: ip

Expand Down Expand Up @@ -689,10 +689,10 @@ jobs:
if: github.event_name != 'pull_request'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Attach to workspace
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: terraform
path: .github/hosted-runner/amd64/
Expand Down Expand Up @@ -734,7 +734,7 @@ jobs:
if: github.event_name != 'pull_request'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get branch name
shell: bash
Expand Down Expand Up @@ -797,15 +797,15 @@ jobs:
terraform output -raw ip > ip.txt
- name: Persist IP to workspace
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ip-arm
path: |
.github/hosted-runner/arm64/ip.txt
retention-days: 1

- name: Persist to workspace
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: terraform2
path: |
Expand All @@ -822,13 +822,13 @@ jobs:
sudo chown -R $USER:$USER $GITHUB_WORKSPACE
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

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

- name: Setup Conan Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{github.workspace}}/build/conan_home/
key: conan-${{ runner.os }}-arm64-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
Expand Down Expand Up @@ -863,7 +863,7 @@ jobs:
echo "DRAFT=true" >> $GITHUB_ENV
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand Down Expand Up @@ -914,7 +914,7 @@ jobs:
if: github.event_name != 'pull_request'
steps:
- name: Attach to workspace
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: ip-arm

Expand Down Expand Up @@ -942,10 +942,10 @@ jobs:
if: github.event_name != 'pull_request'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Attach to workspace
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: terraform2
path: .github/hosted-runner/arm64/
Expand Down Expand Up @@ -985,7 +985,7 @@ jobs:
if: github.event_name != 'pull_request'
steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand Down
Loading

0 comments on commit 2e8ad34

Please sign in to comment.