From 0b644572569005f2094e5f1725706ac093e40082 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@dell.com>
Date: Mon, 16 Nov 2020 15:41:42 -0600
Subject: [PATCH] Move ABI check to Github actions

---
 .circleci/config.yml        | 13 -------------
 .github/workflows/main.yml  | 12 +++++++++++-
 contrib/ci/dependencies.xml |  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea07268b1..923ad2c0a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,17 +1,5 @@
 version: 2
 jobs:
-  check-abi:
-    machine:
-      image: circleci/classic:latest
-    steps:
-      - checkout
-      - run:
-          name: "Build container"
-          command: OS=debian-x86_64 ./contrib/ci/generate_docker.py
-      - run:
-          name: "Run build script"
-          command: docker run -t -v `pwd`:/build fwupd-debian-x86_64 ./contrib/ci/check-abi $(git describe --abbrev=0 --tags) $(git rev-parse HEAD)
-
   build-ubuntu-x86_64:
     machine:
       image: circleci/classic:latest
@@ -175,7 +163,6 @@ workflows:
       - build-windows
       - build-ubuntu-x86_64
       - build-snap
-      - check-abi
       - build-chromeos-x86_64
       - publish-edge:
           requires:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index be4dd40b6..c15c63ec5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,8 +10,18 @@ on:
   pull_request:
     branches: [ master ]
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
+  abi:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install dependencies
+        run: ./contrib/ci/generate_dependencies.py | sudo xargs apt install -y
+      - name: Check ABI
+        run: ./contrib/ci/check-abi $(git describe --abbrev=0 --tags) $(git rev-parse HEAD)
+
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
diff --git a/contrib/ci/dependencies.xml b/contrib/ci/dependencies.xml
index c7963d2a0..d6b812e54 100644
--- a/contrib/ci/dependencies.xml
+++ b/contrib/ci/dependencies.xml
@@ -6,7 +6,7 @@
     </distro>
   </dependency>
   <dependency type="build" id="abigail-tools">
-    <distro id="debian">
+    <distro id="ubuntu">
       <package variant="x86_64" />
     </distro>
   </dependency>