From 9ca8e7564b52ae889961144d6533e8143a0f3771 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaled@aliftype.com>
Date: Sun, 18 Dec 2022 17:44:41 +0200
Subject: [PATCH] Revert "[circleci] Make dist tarball with meson"

This reverts commit 80157cc60baf0f1b26c442c336dc1854216468be.

That was a thinko, meson generated dist tarballs are not usable for
autotools build as they will miss generated autotools files.
---
 .circleci/config.yml | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca6ce4f92..bd7a13c55 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ executors:
   win64-executor:
     docker:
       - image: cimg/base:edge-20.04
-  ubuntu-executor:
+  autotools-executor:
     docker:
       - image: cimg/base:edge-20.04
 
@@ -27,39 +27,29 @@ jobs:
           path: build/meson-logs/
 
   # will be dropped with autotools removal
-  autotools:
-    executor: ubuntu-executor
+  distcheck:
+    executor: autotools-executor
     steps:
       - checkout
       - run: sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools gobject-introspection libfreetype6-dev libglib2.0-dev libgirepository1.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip
+      - run: pip3 install fonttools meson --upgrade
       - run: ./autogen.sh
       - run: make -j2 distcheck
+      - run: rm harfbuzz-* && make distdir
+      - run: cd harfbuzz-* && meson build && ninja -j2 -Cbuild test
+      - run: make dist
       - persist_to_workspace:
           root: .
           paths: harfbuzz-*.tar.xz
 
-  dist:
-    executor: ubuntu-executor
-    steps:
-      - checkout
-      - run: sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y git ninja-build binutils gcc g++ pkg-config gtk-doc-tools gobject-introspection libfreetype6-dev libglib2.0-dev libgirepository1.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip
-      - run: pip3 install fonttools meson --upgrade
-      - run: meson setup build
-      - run: meson compile -Cbuild -j9
-      - run: meson test -Cbuild --print-errorlogs
-      - run: meson dist -Cbuild --no-tests
-      - persist_to_workspace:
-          root: .
-          paths: build/meson-dist/harfbuzz-*.tar.xz
-
   publish-dist:
-    executor: ubuntu-executor
+    executor: autotools-executor
     steps:
       - checkout
       - attach_workspace:
           at: .
       - run: |
-          .ci/publish_release_artifact.sh build/meson-dist/harfbuzz-$CIRCLE_TAG.tar.xz
+          .ci/publish_release_artifact.sh harfbuzz-$CIRCLE_TAG.tar.xz
 
   fedora-valgrind:
     docker:
@@ -182,19 +172,18 @@ workflows:
   build:
     jobs:
       - macos-aat-fonts
-      - dist:
+      - distcheck:
           filters: # must have filter or won't work as a dependency
             tags:
               only: /.*/
       - publish-dist:
           requires:
-            - dist
+            - distcheck
           filters:
             tags:
               only: /^\d+\.\d+\.\d+$/
             branches:
               ignore: /.*/
-      - autotools
       - fedora-valgrind
       - alpine
       - asan-ubsan