From 99ac42d43845deadbc37f895824af796e8c0f6d5 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Wed, 11 Dec 2024 13:55:14 +0100
Subject: [PATCH] Revert "ci: Use `meson introspect` to generate artifact path"

This reverts commit 27445a1c98a463bcb826edae9850972c3616b90c.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3573>
---
 .gitlab-ci.yml                  | 22 ++--------------------
 .gitlab-ci/export-artifact-path | 21 ---------------------
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100755 .gitlab-ci/export-artifact-path

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cb0d0e6e..c0c05c4a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,6 @@ include:
     file: 'flatpak/flatpak_ci_initiative.yml'
   - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/057b052e682d8e5a20c1eb2dd60d5b87d2b56856/templates/fedora.yml'
   - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bc70242ffb8402243e934659ecc1a2d1c89eca2b/templates/ci-fairy.yml'
-  - project: 'Infrastructure/openshift-images/gnome-release-service'
-    file: '/ci-templates/release-module.yml'
   - component: gitlab.gnome.org/GNOME/citemplates/gnomeos-build-sysext@1.0.0-alpha.1
     inputs:
       meson-options:
@@ -279,20 +277,6 @@ nightly:
   needs:
     - flatpak
 
-distinfo:
-  stage: deploy
-  needs:
-    - build
-  script:
-    - .gitlab-ci/export-artifact-path build > dist.env
-  artifacts:
-    reports:
-      dotenv: dist.env
-    paths:
-      - dist.env
-  rules:
-    - if: '$CI_COMMIT_TAG'
-
 dist:
   variables:
     XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
@@ -311,17 +295,15 @@ dist:
         - "**/meson.build"
         - meson/*
 
+
 dist-tarball:
   extends: dist
   needs:
     - build
-    - distinfo
   artifacts:
     expose_as: 'Get tarball here'
     paths:
-      - $TARBALL_ARTIFACT_PATH
-    reports:
-      dotenv: dist.env
+      - build/meson-dist/$CI_PROJECT_NAME-$CI_COMMIT_TAG.tar.xz
   rules:
     - if: '$CI_COMMIT_TAG'
 
diff --git a/.gitlab-ci/export-artifact-path b/.gitlab-ci/export-artifact-path
deleted file mode 100755
index f9a7534fd..000000000
--- a/.gitlab-ci/export-artifact-path
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/gjs -m
-// SPDX-FileCopyrightText: 2024 Florian Müllner <fmuellner@gnome.org>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import Gio from 'gi://Gio';
-import {programArgs, programInvocationName, exit} from 'system';
-
-const [buildDir] = programArgs;
-if (!buildDir) {
-    printerr(`usage: ${programInvocationName} <build-dir>`);
-    exit(1);
-}
-
-const subprocess = Gio.Subprocess.new(
-    ['meson', 'introspect', '--projectinfo', buildDir],
-    Gio.SubprocessFlags.STDOUT_PIPE);
-const [, out] = subprocess.communicate_utf8(null, null);
-
-const {descriptive_name, version} = JSON.parse(out);
-print(`TARBALL_ARTIFACT_PATH=${buildDir}/meson-dist/${descriptive_name}-${version}.tar.xz`);