Skip to content
Snippets Groups Projects
Commit 1ed7a502 authored by Simon McVittie's avatar Simon McVittie
Browse files

CI: Simplify path to relocatable amd64+i386 build of pressure-vessel


Avoid the word "production", which could easily be mistaken for an
official release. It's here for historical reasons. We used to do two
separate relocatable installations, one with production-like compiler
options, and one unoptimized and unstripped for debugging; but I removed
the latter in commit 8649f766 "CI: Skip unpackaged scout builds" in mid
2021, because it slowed down CI and was rarely useful.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 560fd1ac
No related branches found
No related tags found
No related merge requests found
Pipeline #76525 passed
......@@ -286,7 +286,7 @@ relocatable-install:i386:
- _build/i386/pressure-vessel-i386.tar.gz
when: on_success
relocatable-install:production:
relocatable-install:
extends: .relocatable_install
needs:
- package
......@@ -317,27 +317,28 @@ relocatable-install:production:
debian/tmp/artifacts/build/pressure-vessel-libs-i386_*_i386.deb \
${NULL+}
rm -fr _build/production/relocatable-install
mkdir -p _build/production
rm -fr _build/relocatable
rm -fr _build/relocatable-install
mkdir -p _build
python3.5 pressure-vessel/build-relocatable-install.py \
--cache _build/cache \
--output _build/production/relocatable-install \
--archive "$(pwd)/_build/production" \
--output _build/relocatable-install \
--archive "$(pwd)/_build" \
--no-archive-versions \
${CI_ALLOW_MISSING_SOURCES:+--allow-missing-sources} \
${NULL+}
PYTHONPATH=$(pwd)/tests \
python3.5 ./tests/pressure-vessel/relocatable-install.py \
"$(pwd)/_build/production/relocatable-install"
"$(pwd)/_build/relocatable-install"
artifacts:
paths:
- _build/production/pressure-vessel-bin.tar.gz
- _build/production/pressure-vessel-bin+src.tar.gz
- _build/pressure-vessel-bin.tar.gz
- _build/pressure-vessel-bin+src.tar.gz
when: on_success
.test_template:
needs:
- relocatable-install:production
- relocatable-install
stage: test
artifacts:
paths:
......@@ -418,7 +419,7 @@ deploy:
- build:devel # for steam-container-runtime.tar.gz
- package
- package:i386
- relocatable-install:production
- relocatable-install
rules:
- if: '$PRESSURE_VESSEL_CI_UPLOAD_HOST == ""'
when: never
......
......@@ -249,10 +249,10 @@ class Uploader:
if '_all.' not in a.name:
os.link(str(a), str(dbgsym / a.name))
a = Path('_build', 'production', 'pressure-vessel-bin.tar.gz')
a = Path('_build', 'pressure-vessel-bin.tar.gz')
os.link(str(a), upload / a.name)
a = Path('_build', 'production', 'pressure-vessel-bin+src.tar.gz')
a = Path('_build', 'pressure-vessel-bin+src.tar.gz')
# Unpack sources/*.{dsc,tar.*,txt,...} into sources/
with tarfile.open(str(a), 'r') as unarchiver:
......
......@@ -5,7 +5,7 @@
set -eux
builddir="${1:-_build}"
PRESSURE_VESSEL="${2:-_build/production/pressure-vessel-bin.tar.gz}"
PRESSURE_VESSEL="${2:-_build/pressure-vessel-bin.tar.gz}"
rm -fr "$builddir/depot"
rm -fr "$builddir/depot-template"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment