Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gitlab-runner
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Lars Seipel
gitlab-runner
Commits
991a291a
Unverified
Commit
991a291a
authored
6 years ago
by
Tomasz Maczukin
Browse files
Options
Downloads
Patches
Plain Diff
Add dependency check jobs
parent
5b0bb5fc
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+22
-2
22 additions, 2 deletions
.gitlab-ci.yml
Makefile
+11
-1
11 additions, 1 deletion
Makefile
dockerfiles/ci/Dockerfile
+2
-2
2 additions, 2 deletions
dockerfiles/ci/Dockerfile
scripts/dep_status_check
+17
-0
17 additions, 0 deletions
scripts/dep_status_check
with
52 additions
and
5 deletions
.gitlab-ci.yml
+
22
−
2
View file @
991a291a
...
...
@@ -9,7 +9,7 @@ stages:
-
cleanup
variables
:
CI_IMAGE
:
registry.gitlab.com/gitlab-org/gitlab-runner/ci:1.8.7-
0
CI_IMAGE
:
registry.gitlab.com/gitlab-org/gitlab-runner/ci:1.8.7-
1
GOROOT
:
/usr/local/go
before_script
:
...
...
@@ -29,7 +29,7 @@ image: $CI_IMAGE
services
:
-
docker:dind
variables
:
&docker_variables
CI_IMAGE
:
registry.gitlab.com/gitlab-org/gitlab-runner/ci:1.8.7-
0
CI_IMAGE
:
registry.gitlab.com/gitlab-org/gitlab-runner/ci:1.8.7-
1
DOCKER_DRIVER
:
overlay2
DOCKER_HOST
:
tcp://docker:2375
tags
:
...
...
@@ -155,6 +155,25 @@ tests definitions:
tags
:
-
gitlab-org
dep check
:
<<
:
*except_docs
stage
:
prebuild
cache
:
{}
dependencies
:
script
:
-
make dep_check
dep status
:
<<
:
*except_docs
stage
:
prebuild
cache
:
{}
dependencies
:
script
:
-
make dep_status
only
:
variables
:
-
$CI_DEP_STATUS_ENABLED
#
# Test stage
#
...
...
@@ -480,3 +499,4 @@ static QA:
jq -C . gl-code-quality-report.json
exit 1
fi
This diff is collapsed.
Click to expand it.
Makefile
+
11
−
1
View file @
991a291a
...
...
@@ -56,9 +56,10 @@ export CGO_ENABLED ?= 0
# Development Tools
DEP
=
$(
GOPATH_BIN
)
/dep
GOX
=
$(
GOPATH_BIN
)
/gox
MOCKERY
=
$(
GOPATH_BIN
)
/mockery
DEVELOPMENT_TOOLS
=
$(
GOX
)
$(
MOCKERY
)
DEVELOPMENT_TOOLS
=
$(
DEP
)
$(
GOX
)
$(
MOCKERY
)
MOCKERY_FLAGS
=
-note
=
"This comment works around https://github.com/vektra/mockery/issues/155"
...
...
@@ -371,6 +372,12 @@ development_setup:
if
prlctl
--version
;
then
$(
MAKE
)
-C
tests/ubuntu parallels
;
fi
if
vboxmanage
--version
;
then
$(
MAKE
)
-C
tests/ubuntu virtualbox
;
fi
dep_check
:
$(DEP)
@
cd
$(
PKG_BUILD_DIR
)
&&
$(
DEP
)
check
dep_status
:
$(DEP)
@
./scripts/dep_status_check
$(
PKG_BUILD_DIR
)
# local GOPATH
$(GOPATH_SETUP)
:
$(PKG_BUILD_DIR)
mkdir
-p
$(
GOPATH_BIN
)
...
...
@@ -381,6 +388,9 @@ $(PKG_BUILD_DIR):
ln
-s
../../../..
$@
# development tools
$(DEP)
:
$(GOPATH_SETUP)
go get github.com/golang/dep/cmd/dep
$(GOX)
:
$(GOPATH_SETUP)
go get github.com/mitchellh/gox
...
...
This diff is collapsed.
Click to expand it.
dockerfiles/ci/Dockerfile
+
2
−
2
View file @
991a291a
...
...
@@ -5,7 +5,7 @@ RUN apt-get update -yq
RUN
apt-get
install
-yq
locales make xz-utils
\
ruby ruby-dev python-pip
\
dpkg-sig createrepo rpm
\
zip libffi-dev
zip libffi-dev
jq
# Set default locale for the environment
RUN
echo
"en_US UTF-8"
>
/etc/locale.gen
;
\
...
...
@@ -22,6 +22,6 @@ RUN wget -q https://get.docker.com/builds/Linux/x86_64/docker-1.13.1.tgz -O /tmp
chmod
+x /usr/bin/docker
*
;
\
rm
-rf
/tmp/
*
COPY
Makefile /tmp/
COPY
Makefile
*
/tmp/
RUN
cd
/tmp
;
\
make deps package-deps packagecloud-deps
This diff is collapsed.
Click to expand it.
scripts/dep_status_check
0 → 100755
+
17
−
0
View file @
991a291a
#!/bin/bash
pkgBuildDir
=
"
${
1
}
"
outDir
=
"
$(
pwd
)
/out"
reportFile
=
"
${
outDir
}
/dep_status"
mkdir
-p
"
${
outDir
}
"
cd
"
${
pkgBuildDir
}
"
dep status
-v
-old
-json
>
"
${
reportFile
}
"
if
[
"
$(
cat
"
${
reportFile
}
"
)
"
==
"[]"
]
;
then
exit
0
fi
jq
-C
.
"
${
reportFile
}
"
exit
1
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