From 8b0b41f812c20b7e9fdfece6b1f4f6d069c64f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20M=C3=BCller?= <deso@posteo.net>
Date: Thu, 6 Oct 2022 16:21:06 -0700
Subject: [PATCH] Remove travis-ci symlink
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With https://github.com/libbpf/ci/pull/41 merged we no longer require
the travis-ci symlink in this repository. Remove it. Also, it turns out
we still have a few locations referencing travis-ci/ instead of ci/.
Convert those.

Signed-off-by: Daniel Müller <deso@posteo.net>
---
 .github/actions/setup/action.yml  | 4 ++--
 .github/actions/vmtest/action.yml | 2 +-
 travis-ci                         | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 120000 travis-ci

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 63bbff5..1776b15 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -6,7 +6,7 @@ runs:
     - id: variables
       run: |
         export REPO_ROOT=$GITHUB_WORKSPACE
-        export CI_ROOT=$REPO_ROOT/travis-ci
+        export CI_ROOT=$REPO_ROOT/ci
         # this is somewhat ugly, but that is the easiest way to share this code with
         # arch specific docker
         echo 'echo ::group::Env setup' > /tmp/ci_setup
@@ -16,7 +16,7 @@ runs:
         echo export PROJECT_NAME='libbpf' >> /tmp/ci_setup
         echo export AUTHOR_EMAIL="$(git log -1 --pretty=\"%aE\")" >> /tmp/ci_setup
         echo export REPO_ROOT=$GITHUB_WORKSPACE >> /tmp/ci_setup
-        echo export CI_ROOT=$REPO_ROOT/travis-ci >> /tmp/ci_setup
+        echo export CI_ROOT=$REPO_ROOT/ci >> /tmp/ci_setup
         echo export VMTEST_ROOT=$CI_ROOT/vmtest >> /tmp/ci_setup
         echo 'echo ::endgroup::' >> /tmp/ci_setup
       shell: bash
diff --git a/.github/actions/vmtest/action.yml b/.github/actions/vmtest/action.yml
index 8536f04..798501a 100644
--- a/.github/actions/vmtest/action.yml
+++ b/.github/actions/vmtest/action.yml
@@ -36,7 +36,7 @@ runs:
     - name: Patch kernel source
       uses: libbpf/ci/patch-kernel@master
       with:
-        patches-root: '${{ github.workspace }}/travis-ci/diffs'
+        patches-root: '${{ github.workspace }}/ci/diffs'
         repo-root: '.kernel'
     - name: Prepare to build BPF selftests
       shell: bash
diff --git a/travis-ci b/travis-ci
deleted file mode 120000
index 79778e5..0000000
--- a/travis-ci
+++ /dev/null
@@ -1 +0,0 @@
-ci
\ No newline at end of file