Skip to content

Commit

Permalink
fix Jenkinsfile
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen <[email protected]>
  • Loading branch information
StephenInVamrs committed Jul 23, 2019
1 parent 244b593 commit 9cc93e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
12 changes: 2 additions & 10 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ node {
stage "Environment"
checkout scm

def environment = docker.build('build-environment:build-kernel', 'docker')
def environment = docker.build('linux-build-docker:latest', 'docker')

environment.inside("--privileged -u 0:0") {
withEnv([
Expand All @@ -27,14 +27,6 @@ node {
"GITHUB_USER=$GITHUB_USER",
"GITHUB_REPO=$GITHUB_REPO",
]) {
stage ('Environment') {
sh '''#!/bin/bash
set -xe
tar xvf ./gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar -C /usr/local/
'''
}

stage ('Package') {
sh '''#!/bin/bash
set -xe
Expand All @@ -52,7 +44,7 @@ node {
export RELEASE_NAME="$(./dev-make version)"
export RELEASE_TITLE="$(./dev-make version)"
export DESCRIPTION=" "
export DESCRIPTION="Linux packages for ROCK Pi S board"
github-release release \
--target ${RELEASE_REPO_BRANCH} \
Expand Down
4 changes: 2 additions & 2 deletions dev-shell
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CURDIR="$PWD"
case $(uname -s) in
Linux)
echo "Building Docker environment..."
docker build -q -t build-docker:build-kernel docker/
docker build -q -t linux-build-docker:latest docker/
echo "Enter Docker container..."
exec docker run \
--rm \
Expand All @@ -15,7 +15,7 @@ case $(uname -s) in
-h build-env \
-v "${CURDIR}:${CURDIR}" \
-w "${CURDIR}" \
build-docker:build-kernel \
linux-build-docker:latest \
"$@"
;;

Expand Down

0 comments on commit 9cc93e3

Please sign in to comment.