Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
FreshRSS-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
28
Issues
28
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Christophe Henry
FreshRSS-Android
Commits
17417221
Commit
17417221
authored
Mar 01, 2020
by
Christophe Henry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~
parent
f646c563
Pipeline
#3734
passed with stage
in 0 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
47 deletions
+42
-47
Jenkinsfile
Jenkinsfile
+18
-23
app/build.gradle
app/build.gradle
+24
-24
No files found.
Jenkinsfile
View file @
17417221
...
...
@@ -55,14 +55,6 @@ pipeline {
}
stages
{
stage
(
"Compile"
)
{
steps
{
gitlabCommitStatus
(
"Compile"
)
{
sh
"./gradlew compileReleaseSources"
}
}
}
stage
(
"Lint"
)
{
steps
{
gitlabCommitStatus
(
"Lint"
)
{
...
...
@@ -99,21 +91,25 @@ pipeline {
}
}
stage
(
"on min SDK level"
)
{
steps
{
gitlabCommitStatus
(
"Instrumented tests on min SDK image"
)
{
withAvd
(
hardwareProfile:
"Nexus 5X"
,
systemImage:
env
.
MIN_SDK_IMAGE
,
headless:
true
)
{
sh
"./gradlew clean connectedCheck"
stage
(
"Run instrumented tests"
)
{
parallel
{
stage
(
"on min SDK level"
)
{
steps
{
gitlabCommitStatus
(
"Instrumented tests on min SDK image"
)
{
withAvd
(
hardwareProfile:
"Nexus 5X"
,
systemImage:
env
.
MIN_SDK_IMAGE
,
headless:
true
)
{
sh
"./gradlew clean connectedCheck"
}
}
}
}
}
}
stage
(
"on max SDK level"
)
{
steps
{
gitlabCommitStatus
(
"Instrumented tests on max SDK image"
)
{
withAvd
(
hardwareProfile:
"Nexus 5X"
,
systemImage:
env
.
MAX_SDK_IMAGE
,
headless:
true
)
{
sh
"./gradlew clean connectedCheck"
stage
(
"on max SDK level"
)
{
steps
{
gitlabCommitStatus
(
"Instrumented tests on max SDK image"
)
{
withAvd
(
hardwareProfile:
"Nexus 5X"
,
systemImage:
env
.
MAX_SDK_IMAGE
,
headless:
true
)
{
sh
"./gradlew clean connectedCheck"
}
}
}
}
}
...
...
@@ -122,7 +118,7 @@ pipeline {
stage
(
"Build APK"
)
{
steps
{
gitlabCommitStatus
(
"Build APK"
)
{
sh
(
"""./gradlew clean assemble
Release
\
sh
(
"""./gradlew clean assemble
Jenkins
\
-Pandroid.injected.signing.store.file=${env.SIGN_KEY_PATH} \
-Pandroid.injected.signing.store.password=${env.SIGN_KEY_CREDENTIALS_PSW} \
-Pandroid.injected.signing.key.alias=${env.SIGN_KEY_CREDENTIALS_USR} \
...
...
@@ -145,11 +141,10 @@ pipeline {
def
getBuildSteps
(
String
branch
)
{
def
buildSteps
=
[
"Compile"
,
"Lint"
,
"Unit tests"
,
"Instrumented tests on min SDK image"
,
"Instrumented tests on max SDK image"
"Instrumented tests on max SDK image"
,
]
if
(
branch
==
"develop"
)
return
buildSteps
+
[
"Build APK"
]
return
buildSteps
...
...
app/build.gradle
View file @
17417221
...
...
@@ -34,20 +34,6 @@ android {
freeCompilerArgs
=
[
"-Xallow-result-return-type"
]
}
testOptions
{
unitTests
.
all
{
testLogging
{
events
"passed"
,
"skipped"
,
"failed"
,
"standardOut"
,
"standardError"
outputs
.
upToDateWhen
{
false
}
showStandardStreams
=
true
}
}
}
lintOptions
{
disable
"AllowBackup"
,
"VectorPath"
,
"GradleDependency"
,
"MissingTranslation"
,
"InvalidPackage"
}
sourceSets
{
androidTest
.
assets
.
srcDirs
+=
files
(
schema_location
)
}
...
...
@@ -57,14 +43,9 @@ android {
minifyEnabled
false
proguardFiles
getDefaultProguardFile
(
"proguard-android-optimize.txt"
),
"proguard-rules.pro"
}
}
dataBinding
{
enabled
=
true
}
configurations
.
all
{
resolutionStrategy
.
force
"com.google.code.findbugs:jsr305:1.3.9"
jenkins
{
initWith
release
}
}
applicationVariants
.
all
{
variant
->
...
...
@@ -73,14 +54,34 @@ android {
delete
new
FileNameFinder
().
getFileNames
(
buildDir
.
absolutePath
,
"**/config.properties"
)
}
}
variant
.
outputs
.
all
{
output
->
outputFileName
=
new
File
(
"FreshRSS-Jenkins-${variant.versionName}-${variant.name}.apk"
)
if
(
variant
.
name
==
"jenkins"
)
outputFileName
=
new
File
(
"FreshRSS-develop-jenkins.apk"
)
else
outputFileName
=
new
File
(
"FreshRSS-${variant.versionName}-${variant.name}.apk"
)
}
}
androidExtensions
{
experimental
=
true
}
dataBinding
{
enabled
=
true
}
testOptions
{
unitTests
.
all
{
testLogging
{
events
"passed"
,
"skipped"
,
"failed"
,
"standardOut"
,
"standardError"
outputs
.
upToDateWhen
{
false
}
showStandardStreams
=
true
}
}
}
lintOptions
{
disable
"AllowBackup"
,
"VectorPath"
,
"GradleDependency"
,
"MissingTranslation"
,
"InvalidPackage"
}
}
configurations
{
...
...
@@ -111,7 +112,6 @@ dependencies {
def
roomigrant_version
=
"0.1.7"
def
jackson_version
=
'2.10.2'
def
espresso_version
=
"3.2.0"
def
promise_version
=
"3.3.0"
def
android_navigation
=
"1.0.0"
def
jsoup_version
=
'1.12.2'
def
acraVersion
=
'5.5.0'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment