Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
flatdeb-steam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
steamrt
flatdeb-steam
Commits
7e9ae1c8
Commit
7e9ae1c8
authored
6 years ago
by
Simon McVittie
Browse files
Options
Downloads
Patches
Plain Diff
Reorder artifact filenames to group related files better
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
6dc63ef3
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
flatdeb/debos-base.yaml
+5
-5
5 additions, 5 deletions
flatdeb/debos-base.yaml
flatdeb/debos-runtimes.yaml
+8
-7
8 additions, 7 deletions
flatdeb/debos-runtimes.yaml
run.py
+7
-17
7 additions, 17 deletions
run.py
with
20 additions
and
29 deletions
flatdeb/debos-base.yaml
+
5
−
5
View file @
7e9ae1c8
...
...
@@ -8,8 +8,8 @@
{{
- $keyring
:
= or .keyring "" -
}}
{{
- $keyringpackage
:
= or .keyringpackage "" -
}}
{{
- $version
:
= or .version "0" -
}}
{{
- $
ospack
:
= or .ospack
(printf "base
_
%s
_
%s
_
%s
.tar.gz
" $suite $version $architecture) -
}}
{{
- $
manifest_prefix
:
= or .manifest_prefix (printf "base_%s_%s_%s" $suite $version $architecture
) -
}}
{{
- $
artifact_prefix
:
= or .artifact_prefix
(printf "base
-
%s
-
%s
-
%s" $suite $version $architecture) -
}}
{{
- $
ospack
:
= or .ospack (printf "%s.tar.gz" $artifact_prefix
) -
}}
architecture
:
{{
$architecture
}}
...
...
@@ -110,9 +110,9 @@ actions:
chroot
:
false
command
:
|
"$RECIPEDIR/write-manifest" "$ROOTDIR"
cp "$ROOTDIR/usr/manifest.dpkg" "$ARTIFACTDIR/{{ $
manifes
t_prefix }}.manifest.dpkg"
cp "$ROOTDIR/usr/manifest.dpkg.built-using" "$ARTIFACTDIR/{{ $
manifes
t_prefix }}.manifest.dpkg.built-using"
cp "$ROOTDIR/usr/manifest.deb822.gz" "$ARTIFACTDIR/{{ $
manifes
t_prefix }}.manifest.deb822.gz"
cp "$ROOTDIR/usr/manifest.dpkg" "$ARTIFACTDIR/{{ $
artifac
t_prefix }}.manifest.dpkg"
cp "$ROOTDIR/usr/manifest.dpkg.built-using" "$ARTIFACTDIR/{{ $
artifac
t_prefix }}.manifest.dpkg.built-using"
cp "$ROOTDIR/usr/manifest.deb822.gz" "$ARTIFACTDIR/{{ $
artifac
t_prefix }}.manifest.deb822.gz"
# No point in archiving these
-
action
:
run
...
...
This diff is collapsed.
Click to expand it.
flatdeb/debos-runtimes.yaml
+
8
−
7
View file @
7e9ae1c8
...
...
@@ -13,13 +13,14 @@
{{
- $ospack
:
= or .ospack (printf "base_%s_%s_%s.tar.gz" $suite $version $architecture) -
}}
{{
- $runtime
:
= .runtime -
}}
{{
- $runtime_branch
:
= or .runtime_branch "master" -
}}
{{
- $sysroot_prefix
:
= or .sysroot_prefix (printf "sysroot_%s_%s_%s" $runtime $flatpak_arch $runtime_branch) -
}}
{{
- $artifact_prefix
:
= or .artifact_prefix (printf "%s-%s-%s" $runtime $flatpak_arch $runtime_branch) -
}}
{{
- $sysroot_prefix
:
= or .sysroot_prefix (printf "%s-sysroot" $artifact_prefix) -
}}
{{
- $sysroot_tarball
:
= or .sysroot_tarball "" -
}}
{{
- $ostree_prefix
:
= or .ostree_prefix (printf "
ostree_%s_%s_%s" $
runtime $
flatpak_arch $runtime_branch
) -
}}
{{
- $ostree_prefix
:
= or .ostree_prefix (printf "
%s-
runtime
"
$
artifact_prefix
) -
}}
{{
- $ostree_tarball
:
= or .ostree_tarball (printf "%s.tar.gz" $ostree_prefix) -
}}
{{
- $sources_prefix
:
= or .sources_prefix (printf "sources
_%s_%s_%s" $runtime $flatpak_arch $runtime_branch
) -
}}
{{
- $sources_prefix
:
= or .sources_prefix (printf "
%s-
sources
" $artifact_prefix
) -
}}
{{
- $sources_tarball
:
= or .sources_tarball (printf "%s.tar.gz" $sources_prefix) -
}}
{{
- $debug_prefix
:
= or .debug_prefix (printf "debug
_%s_%s_%s" $runtime $flatpak_arch $runtime_branch
) -
}}
{{
- $debug_prefix
:
= or .debug_prefix (printf "
%s-
debug
" $artifact_prefix
) -
}}
{{
- $debug_tarball
:
= or .debug_tarball (printf "%s.tar.gz" $debug_prefix) -
}}
architecture
:
{{
$architecture
}}
...
...
@@ -121,9 +122,9 @@ actions:
chroot
:
false
command
:
|
"$RECIPEDIR/write-manifest" "$ROOTDIR"
cp "$ROOTDIR/usr/manifest.dpkg" "$ARTIFACTDIR/{{ $
ostree
_prefix }}.manifest.dpkg"
cp "$ROOTDIR/usr/manifest.dpkg.built-using" "$ARTIFACTDIR/{{ $
ostree
_prefix }}.manifest.dpkg.built-using"
cp "$ROOTDIR/usr/manifest.deb822.gz" "$ARTIFACTDIR/{{ $
ostree
_prefix }}.manifest.deb822.gz"
cp "$ROOTDIR/usr/manifest.dpkg" "$ARTIFACTDIR/{{ $
artifact
_prefix }}.manifest.dpkg"
cp "$ROOTDIR/usr/manifest.dpkg.built-using" "$ARTIFACTDIR/{{ $
artifact
_prefix }}.manifest.dpkg.built-using"
cp "$ROOTDIR/usr/manifest.deb822.gz" "$ARTIFACTDIR/{{ $
artifact
_prefix }}.manifest.deb822.gz"
{{
if $sdk
}}
-
action
:
run
...
...
This diff is collapsed.
Click to expand it.
run.py
+
7
−
17
View file @
7e9ae1c8
...
...
@@ -572,7 +572,7 @@ class Builder:
self
.
apt_sources
[
0
].
uri
,
),
'
-t
'
,
'
ospack:{}
'
.
format
(
tarball
+
'
.new
'
),
'
-t
'
,
'
manifes
t_prefix:base-{}-{}
'
.
format
(
'
-t
'
,
'
artifac
t_prefix:base-{}-{}
'
.
format
(
self
.
apt_suite
,
'
,
'
.
join
(
self
.
dpkg_archs
),
),
...
...
@@ -708,11 +708,12 @@ class Builder:
else
:
runtime
=
prefix
+
'
.Platform
'
ostree
_prefix
=
'
{}-
ostree-
{}-{}
'
.
format
(
artifact
_prefix
=
'
{}-{}-{}
'
.
format
(
runtime
,
'
,
'
.
join
(
self
.
dpkg_archs
),
self
.
runtime_branch
,
)
ostree_prefix
=
artifact_prefix
+
'
-runtime
'
out_tarball
=
ostree_prefix
+
'
.tar.gz
'
argv
=
[
...
...
@@ -723,6 +724,7 @@ class Builder:
'
-t
'
,
'
flatpak_arch:{}
'
.
format
(
self
.
flatpak_arch
),
'
-t
'
,
'
suite:{}
'
.
format
(
self
.
apt_suite
),
'
-t
'
,
'
ospack:{}
'
.
format
(
tarball
),
'
-t
'
,
'
artifact_prefix:{}
'
.
format
(
artifact_prefix
),
'
-t
'
,
'
ostree_prefix:{}
'
.
format
(
ostree_prefix
),
'
-t
'
,
'
ostree_tarball:{}
'
.
format
(
out_tarball
+
'
.new
'
),
'
-t
'
,
'
runtime:{}
'
.
format
(
runtime
),
...
...
@@ -764,26 +766,14 @@ class Builder:
argv
.
append
(
'
post_script:post_script
'
)
if
sdk
:
sources_prefix
=
'
{}-sources-{}-{}
'
.
format
(
runtime
,
'
,
'
.
join
(
self
.
dpkg_archs
),
self
.
runtime_branch
,
)
sources_prefix
=
artifact_prefix
+
'
-sources
'
sources_tarball
=
sources_prefix
+
'
.tar.gz
'
debug_prefix
=
'
{}-debug-{}-{}
'
.
format
(
runtime
,
'
,
'
.
join
(
self
.
dpkg_archs
),
self
.
runtime_branch
,
)
debug_prefix
=
artifact_prefix
+
'
-debug
'
debug_tarball
=
debug_prefix
+
'
.tar.gz
'
if
generate_sysroot_tarball
:
sysroot_prefix
=
'
{}-sysroot-{}-{}
'
.
format
(
runtime
,
'
,
'
.
join
(
self
.
dpkg_archs
),
self
.
runtime_branch
,
)
sysroot_prefix
=
artifact_prefix
+
'
-sysroot
'
sysroot_tarball
=
sysroot_prefix
+
'
.tar.gz
'
argv
.
append
(
'
-t
'
)
argv
.
append
(
'
sysroot_prefix:{}
'
.
format
(
sysroot_prefix
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment