From 4bdc44027c2882ca68e69d2b7c1908f17b33bc50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20M=C3=BCller?= <deso@posteo.net>
Date: Thu, 25 Jan 2024 13:02:19 -0800
Subject: [PATCH] CI: Build libbpf-rs-test-project outside of libbpf-sys
 workspace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Our libbpf-rs integration workflow fails when invoked on the publish
path, because, evidently, Cargo attempts to query the libbpf-sys of an
unpublished version from crates.io (or at least that is my reading of
it).
Work around this behavior by creating the test project outside of the
workspace.

Signed-off-by: Daniel Müller <deso@posteo.net>
---
 .github/workflows/ci.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ea4e1b7..2b221b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -142,17 +142,18 @@ jobs:
 
       - name: Build libbpf-rs with libbpf-sys
         run: |
+          dir=$(pwd)
+          cd /tmp/
           cargo init --bin libbpf-rs-test-project
           cd libbpf-rs-test-project
-          # Add the most recent *published* version of libbpf-rs (as opposed to,
-          # say, cloning a development snapshot, which would just introduce
-          # additional uncertainty into the process).
-          cargo add libbpf-rs
-          # Override libbpf-sys in use with our current one.
+          # Add libbpf-rs dependency and override libbpf-sys in use with our
+          # current one.
           cat >> Cargo.toml <<EOF
+          libbpf-rs = "*"
           [patch.crates-io]
-          libbpf-sys = { path = '..' }
+          libbpf-sys = { path = "${dir}" }
           EOF
+          cargo update
           cargo build
 
   publish: