Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
steam-runtime-tools
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
steam-runtime-tools
Commits
f1e9cae4
Commit
f1e9cae4
authored
4 years ago
by
Simon McVittie
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/master' into master
parents
8ebe69a7
545e4614
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/gitlab-ci.yml
+7
-2
7 additions, 2 deletions
debian/gitlab-ci.yml
tests/containers.py
+4
-2
4 additions, 2 deletions
tests/containers.py
with
11 additions
and
4 deletions
debian/gitlab-ci.yml
+
7
−
2
View file @
f1e9cae4
...
@@ -293,18 +293,23 @@ test:focal:
...
@@ -293,18 +293,23 @@ test:focal:
test:archlinux
:
test:archlinux
:
extends
:
.test_template
extends
:
.test_template
image
:
archlinux:latest
image
:
archlinux:latest
# TODO this test does not work yet
when
:
manual
# Do not use the global before_script because it is only for Debian based
# Do not use the global before_script because it is only for Debian based
# distros
# distros
before_script
:
before_script
:
-
|
-
|
set -eux
set -eux
# Enable multilib repository
echo -e "\n[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
pacman -Syu --needed --noconfirm --noprogressbar \
pacman -Syu --needed --noconfirm --noprogressbar \
base-devel \
base-devel \
git \
git \
lib32-glibc \
lib32-mesa \
python \
python \
python-chardet \
python-six \
python-tappy \
python-tappy \
sudo \
sudo \
${NULL+}
${NULL+}
...
...
This diff is collapsed.
Click to expand it.
tests/containers.py
+
4
−
2
View file @
f1e9cae4
...
@@ -922,12 +922,14 @@ class TestContainers(BaseTest):
...
@@ -922,12 +922,14 @@ class TestContainers(BaseTest):
if
os
.
path
.
isfile
(
'
/usr/bin/locale
'
):
if
os
.
path
.
isfile
(
'
/usr/bin/locale
'
):
link
=
os
.
path
.
join
(
tree
,
'
usr
'
,
'
bin
'
,
'
locale
'
)
link
=
os
.
path
.
join
(
tree
,
'
usr
'
,
'
bin
'
,
'
locale
'
)
target
=
os
.
readlink
(
link
)
target
=
os
.
readlink
(
link
)
self
.
assertEqual
(
target
,
'
/run/host/usr/bin/locale
'
)
# Might be either /usr/bin/locale or /usr/sbin/locale
self
.
assertRegex
(
target
,
r
'
^/run/host/usr/
'
)
if
os
.
path
.
isfile
(
'
/usr/bin/localedef
'
):
if
os
.
path
.
isfile
(
'
/usr/bin/localedef
'
):
link
=
os
.
path
.
join
(
tree
,
'
usr
'
,
'
bin
'
,
'
localedef
'
)
link
=
os
.
path
.
join
(
tree
,
'
usr
'
,
'
bin
'
,
'
localedef
'
)
target
=
os
.
readlink
(
link
)
target
=
os
.
readlink
(
link
)
self
.
assertEqual
(
target
,
'
/run/host/usr/bin/localedef
'
)
# Might be either /usr/bin/localedef or /usr/sbin/localedef
self
.
assertRegex
(
target
,
r
'
^/run/host/usr/
'
)
for
ldso
,
scout_impl
in
(
for
ldso
,
scout_impl
in
(
(
(
...
...
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