From 2af7fd9f0faff62cb8784927510d8d15eda3c610 Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Tue, 18 Apr 2023 17:54:07 +0200 Subject: [PATCH] fix(ci): fixed reusable_build_packages to properly install `git` before invoking checkout action, to download full repo. Signed-off-by: Federico Di Pierro --- .../workflows/reusable_build_packages.yaml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/reusable_build_packages.yaml b/.github/workflows/reusable_build_packages.yaml index 738f383d..928c04fa 100644 --- a/.github/workflows/reusable_build_packages.yaml +++ b/.github/workflows/reusable_build_packages.yaml @@ -17,15 +17,15 @@ jobs: runs-on: ${{ (inputs.arch == "aarch64") && fromJSON('[ "self-hosted", "linux", "ARM64" ]') || 'ubuntu-latest' }} container: fedora:latest steps: + - name: Install build dependencies + run: | + dnf install -y bpftool ca-certificates cmake make automake gcc gcc-c++ kernel-devel clang git pkg-config autoconf automake libbpf-devel + - name: Checkout uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Install build dependencies - run: | - dnf install -y bpftool ca-certificates cmake make automake gcc gcc-c++ kernel-devel clang git pkg-config autoconf automake libbpf-devel - - name: Build modern BPF skeleton run: | mkdir skeleton-build && cd skeleton-build @@ -47,6 +47,13 @@ jobs: outputs: version: ${{ steps.store_version.outputs.version }} steps: + - name: Install build dependencies + run: | + yum -y install centos-release-scl + yum -y install devtoolset-9-gcc devtoolset-9-gcc-c++ + source /opt/rh/devtoolset-9/enable + yum install -y git wget make m4 rpm-build + - name: Checkout uses: actions/checkout@v3 with: @@ -58,13 +65,6 @@ jobs: name: bpf_probe_${{ inputs.arch }}.skel.h path: /tmp - - name: Install build dependencies - run: | - yum -y install centos-release-scl - yum -y install devtoolset-9-gcc devtoolset-9-gcc-c++ - source /opt/rh/devtoolset-9/enable - yum install -y git wget make m4 rpm-build - - name: Install updated cmake run: | curl -L -o /tmp/cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-linux-$(uname -m).tar.gz @@ -132,14 +132,14 @@ jobs: runs-on: ubuntu-latest container: alpine:3.17 steps: + - name: Install build dependencies + run: | + apk add g++ gcc cmake make git bash perl linux-headers autoconf automake m4 libtool elfutils-dev libelf-static patch binutils bpftool clang + - name: Checkout uses: actions/checkout@v3 with: fetch-depth: 0 - - - name: Install build dependencies - run: | - apk add g++ gcc cmake make git bash perl linux-headers autoconf automake m4 libtool elfutils-dev libelf-static patch binutils bpftool clang - name: Prepare project run: |