Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
xfce4-dev-tools
Manage
Activity
Members
Labels
Plan
Issues
7
Issue boards
Milestones
Code
Merge requests
3
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
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
Xfce
xfce4-dev-tools
Merge requests
!36
helpers: Prefer xfce-build over xfce-test (Fixes
#38
)
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
helpers: Prefer xfce-build over xfce-test (Fixes
#38
)
ochosi/xfce4-dev-tools:use-xfce-build
into
master
Overview
1
Commits
1
Pipelines
1
Changes
1
Merged
Simon Steinbeiß
requested to merge
ochosi/xfce4-dev-tools:use-xfce-build
into
master
4 years ago
Overview
1
Commits
1
Pipelines
1
Changes
1
Expand
The xfce-build container is smaller and also what we use in GitLab CI.
👍
0
👎
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
bdb5745f
1 commit,
4 years ago
1 file
+
10
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
helpers/xfce-do-release
+
10
−
3
Options
@@ -28,7 +28,10 @@ sanity_checks () {
git status
--untracked-files
=
no
-s
read
-n
1
-s
-p
"Do you really want to continue?"
fi
if
!
which xfce-test
>
/dev/null
;
then
if
which xfce-build
>
/dev/null
;
then
export
TAG
=
"xfce-build"
echo
"Working with the 'xfce-build' script and container."
elif
!
which xfce-test
>
/dev/null
;
then
echo
"INFO: please install xfce-test to support building in a clean environment. See https://github.com/schuellerf/xfce-test"
else
images
=
$(
docker images|grep
-Po
"(?<=^schuellerf/xfce-test) +[^ ]+"
|tr
-d
' '
)
@@ -188,9 +191,13 @@ run_steps () {
edit NEWS
step
"Build the tarball
\e
[0m(./autogen.sh && make distcheck)"
# either in xfce-test container or on the local machine
# either in
the xfce-build or
xfce-test container or on the local machine
if
[
-n
"
$TAG
"
]
;
then
run_command
"xfce-test call ./autogen.sh"
"xfce-test call make distcheck"
if
[[
"
$TAG
"
==
"xfce-build"
]]
;
then
run_command
"xfce-build"
else
run_command
"xfce-test call ./autogen.sh"
"xfce-test call make distcheck"
fi
else
run_command
"./autogen.sh"
"make distcheck"
fi
Loading