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>
This commit is contained in:
Bilal Elmoussaoui 2024-12-11 13:55:14 +01:00
parent 64d5d01360
commit 99ac42d438
2 changed files with 2 additions and 41 deletions

View File

@ -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'

View File

@ -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`);