chore(ci)_: fix formatting, bump library version
Also drop unused `_assets/ci/validate-vendor.sh` script. Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
61e20dd2e8
commit
bc984e0cb1
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env groovy
|
#!/usr/bin/env groovy
|
||||||
library 'status-jenkins-lib@v1.8.10'
|
library 'status-jenkins-lib@v1.9.6'
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent { label 'linux' }
|
agent { label 'linux' }
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env groovy
|
#!/usr/bin/env groovy
|
||||||
library 'status-jenkins-lib@v1.9.1'
|
library 'status-jenkins-lib@v1.9.6'
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent { label 'linux && x86_64 && nix-2.19' }
|
agent { label 'linux && x86_64 && nix-2.19' }
|
||||||
|
@ -38,7 +38,13 @@ pipeline {
|
||||||
GOCACHE = "${WORKSPACE_TMP}/gocache"
|
GOCACHE = "${WORKSPACE_TMP}/gocache"
|
||||||
PATH = "${PATH}:${GOPATH}/bin"
|
PATH = "${PATH}:${GOPATH}/bin"
|
||||||
REPO_SRC = "${GOPATH}/src/github.com/status-im/status-go"
|
REPO_SRC = "${GOPATH}/src/github.com/status-im/status-go"
|
||||||
ARTIFACT = utils.pkgFilename(name: "status-go", type: "android", ext: "aar", version: sh(script: "./_assets/scripts/version.sh", returnStdout: true))
|
VERSION = sh(script: "./_assets/scripts/version.sh", returnStdout: true)
|
||||||
|
ARTIFACT = utils.pkgFilename(
|
||||||
|
name: 'status-go',
|
||||||
|
type: env.PLATFORM,
|
||||||
|
version: env.VERSION,
|
||||||
|
ext: 'aar',
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env groovy
|
#!/usr/bin/env groovy
|
||||||
library 'status-jenkins-lib@v1.8.18'
|
library 'status-jenkins-lib@v1.9.6'
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent { label 'linux' }
|
agent { label 'linux' }
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env groovy
|
#!/usr/bin/env groovy
|
||||||
library 'status-jenkins-lib@v1.9.1'
|
library 'status-jenkins-lib@v1.9.6'
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent { label 'macos && aarch64 && xcode-15.1 && nix-2.19' }
|
agent { label 'macos && aarch64 && xcode-15.1 && nix-2.19' }
|
||||||
|
@ -38,7 +38,13 @@ pipeline {
|
||||||
GOCACHE = "${WORKSPACE_TMP}/gocache"
|
GOCACHE = "${WORKSPACE_TMP}/gocache"
|
||||||
PATH = "${PATH}:${GOPATH}/bin"
|
PATH = "${PATH}:${GOPATH}/bin"
|
||||||
REPO_SRC = "${GOPATH}/src/github.com/status-im/status-go"
|
REPO_SRC = "${GOPATH}/src/github.com/status-im/status-go"
|
||||||
ARTIFACT = utils.pkgFilename(name: "status-go", type: "ios", ext: "zip", version: sh(script: "./_assets/scripts/version.sh", returnStdout: true))
|
VERSION = sh(script: "./_assets/scripts/version.sh", returnStdout: true)
|
||||||
|
ARTIFACT = utils.pkgFilename(
|
||||||
|
name: 'status-go',
|
||||||
|
type: env.PLATFORM,
|
||||||
|
version: env.VERSION,
|
||||||
|
ext: 'zip',
|
||||||
|
)
|
||||||
/* fix for gomobile complaining about missing packages */
|
/* fix for gomobile complaining about missing packages */
|
||||||
CGO_ENABLED = "1"
|
CGO_ENABLED = "1"
|
||||||
}
|
}
|
||||||
|
@ -60,8 +66,7 @@ pipeline {
|
||||||
stage('Archive') {
|
stage('Archive') {
|
||||||
steps {
|
steps {
|
||||||
dir('build/bin') {
|
dir('build/bin') {
|
||||||
sh 'zip -r status-go-ios.zip Statusgo.xcframework'
|
sh "zip -r ${WORKSPACE}/${ARTIFACT} Statusgo.xcframework"
|
||||||
sh "mv status-go-ios.zip ${WORKSPACE}/${ARTIFACT}"
|
|
||||||
}
|
}
|
||||||
archiveArtifacts(ARTIFACT)
|
archiveArtifacts(ARTIFACT)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env groovy
|
#!/usr/bin/env groovy
|
||||||
library 'status-jenkins-lib@v1.9.1'
|
library 'status-jenkins-lib@v1.9.6'
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent { label 'linux && x86_64 && nix-2.19' }
|
agent { label 'linux && x86_64 && nix-2.19' }
|
||||||
|
@ -38,7 +38,13 @@ pipeline {
|
||||||
GOCACHE = "${WORKSPACE_TMP}/gocache"
|
GOCACHE = "${WORKSPACE_TMP}/gocache"
|
||||||
PATH = "${PATH}:${GOPATH}/bin"
|
PATH = "${PATH}:${GOPATH}/bin"
|
||||||
REPO_SRC = "${GOPATH}/src/github.com/status-im/status-go"
|
REPO_SRC = "${GOPATH}/src/github.com/status-im/status-go"
|
||||||
ARTIFACT = utils.pkgFilename(name: "status-go", type: "desktop", ext: "zip", version: sh(script: "./_assets/scripts/version.sh", returnStdout: true))
|
VERSION = sh(script: "./_assets/scripts/version.sh", returnStdout: true)
|
||||||
|
ARTIFACT = utils.pkgFilename(
|
||||||
|
name: 'status-go',
|
||||||
|
type: env.PLATFORM,
|
||||||
|
version: env.VERSION,
|
||||||
|
ext: 'zip',
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env groovy
|
#!/usr/bin/env groovy
|
||||||
library 'status-jenkins-lib@v1.8.18'
|
library 'status-jenkins-lib@v1.9.6'
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent { label 'linux && x86_64 && nix-2.19' }
|
agent { label 'linux && x86_64 && nix-2.19' }
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
library 'status-jenkins-lib@v1.8.17'
|
#!/usr/bin/env groovy
|
||||||
|
library 'status-jenkins-lib@v1.9.6'
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent { label 'linux && x86_64 && nix-2.19' }
|
agent { label 'linux && x86_64 && nix-2.19' }
|
||||||
|
@ -40,18 +41,20 @@ pipeline {
|
||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
script {
|
script {
|
||||||
archiveArtifacts artifacts: '**/results.xml', allowEmptyArchive: true
|
archiveArtifacts(
|
||||||
|
artifacts: '**/results.xml',
|
||||||
|
allowEmptyArchive: true,
|
||||||
|
)
|
||||||
junit(
|
junit(
|
||||||
testResults: '**/results.xml',
|
testResults: '**/results.xml',
|
||||||
skipOldReports: true,
|
skipOldReports: true,
|
||||||
skipPublishingChecks: true,
|
skipPublishingChecks: true,
|
||||||
skipMarkingBuildUnstable: true
|
skipMarkingBuildUnstable: true,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
success { script { github.notifyPR(true) } }
|
success { script { github.notifyPR(true) } }
|
||||||
failure { script { github.notifyPR(false) } }
|
failure { script { github.notifyPR(false) } }
|
||||||
cleanup { sh "make git-clean" }
|
cleanup { sh 'make git-clean' }
|
||||||
} // post
|
} // post
|
||||||
} // pipeline
|
} // pipeline
|
||||||
|
|
|
@ -1,62 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 2017 The Go Authors. All rights reserved.
|
|
||||||
# Use of this source code is governed by a BSD-style
|
|
||||||
# license that can be found in the LICENSE file.
|
|
||||||
#
|
|
||||||
# This script checks if we changed anything with regard to dependency management
|
|
||||||
# for our repo and makes sure that it was done in a valid way.
|
|
||||||
#
|
|
||||||
# This file is a copy of https://github.com/golang/dep/blob/master/hack/validate-vendor.bash
|
|
||||||
# with some comments added.
|
|
||||||
|
|
||||||
set -e -o pipefail
|
|
||||||
|
|
||||||
# Is validate upstream empty ?
|
|
||||||
if [ -z "$VALIDATE_UPSTREAM" ]; then
|
|
||||||
VALIDATE_REPO='https://github.com/status-im/status-go'
|
|
||||||
|
|
||||||
if [ -z "$VALIDATE_BRANCH" ]; then
|
|
||||||
VALIDATE_BRANCH='develop'
|
|
||||||
fi
|
|
||||||
|
|
||||||
VALIDATE_HEAD="$(git rev-parse --verify HEAD)"
|
|
||||||
|
|
||||||
git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH"
|
|
||||||
VALIDATE_UPSTREAM="$(git rev-parse --verify FETCH_HEAD)"
|
|
||||||
|
|
||||||
VALIDATE_COMMIT_DIFF="$VALIDATE_UPSTREAM...$VALIDATE_HEAD"
|
|
||||||
|
|
||||||
validate_diff() {
|
|
||||||
if [ "$VALIDATE_UPSTREAM" != "$VALIDATE_HEAD" ]; then
|
|
||||||
git diff "$VALIDATE_COMMIT_DIFF" "$@"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
IFS=$'\n'
|
|
||||||
files=( $(validate_diff --diff-filter=ACMR --name-only -- 'Gopkg.toml' 'Gopkg.lock' 'vendor/' || true) )
|
|
||||||
unset IFS
|
|
||||||
|
|
||||||
# `files[@]` splits the content of files by whitespace and returns a list.
|
|
||||||
# `#` returns the number of the lines.
|
|
||||||
if [ ${#files[@]} -gt 0 ]; then
|
|
||||||
dep ensure -vendor-only
|
|
||||||
|
|
||||||
# Let see if the working directory is clean
|
|
||||||
diffs="$(git status --porcelain -- vendor Gopkg.toml Gopkg.lock 2>/dev/null)"
|
|
||||||
if [ "$diffs" ]; then
|
|
||||||
{
|
|
||||||
echo 'The contents of vendor differ after "dep ensure":'
|
|
||||||
echo
|
|
||||||
echo "$diffs"
|
|
||||||
echo
|
|
||||||
echo 'Make sure these commands have been run before committing.'
|
|
||||||
echo
|
|
||||||
} >&2
|
|
||||||
false
|
|
||||||
else
|
|
||||||
echo 'Congratulations! All vendoring changes are done the right way.'
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo 'No vendor changes in diff.'
|
|
||||||
fi
|
|
Loading…
Reference in New Issue