Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
org.benoitharrault.puzzlegame
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
android
org.benoitharrault.puzzlegame
Commits
bbc0d6e4
Commit
bbc0d6e4
authored
3 years ago
by
Benoît Harrault
Browse files
Options
Downloads
Plain Diff
Merge branch '36-add-jabber-notification-on-create-tag' into 'master'
Resolve "Add jabber notification on create tag" Closes
#36
See merge request
!31
parents
5936f845
dba581f5
No related branches found
Branches containing commit
Tags
Release_0.3.2_18
Tags containing commit
1 merge request
!31
Resolve "Add jabber notification on create tag"
Pipeline
#1683
passed
3 years ago
Stage: update
Stage: build-debug
Changes
2
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
android/gradle.properties
+2
-2
2 additions, 2 deletions
android/gradle.properties
with
4 additions
and
2 deletions
.gitlab-ci.yml
+
2
−
0
View file @
bbc0d6e4
...
@@ -96,6 +96,7 @@ application:release:
...
@@ -96,6 +96,7 @@ application:release:
dependencies
:
dependencies
:
-
android:build-release
-
android:build-release
script
:
script
:
-
apk --no-cache add curl
-
git config user.email "${GITLAB_USER_EMAIL}"
-
git config user.email "${GITLAB_USER_EMAIL}"
-
git config user.name "${GITLAB_USER_NAME}"
-
git config user.name "${GITLAB_USER_NAME}"
-
git remote set-url origin https://oauth2:${GITLAB_ACCESS_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}
-
git remote set-url origin https://oauth2:${GITLAB_ACCESS_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}
...
@@ -110,6 +111,7 @@ application:release:
...
@@ -110,6 +111,7 @@ application:release:
else
else
git tag -a "${TAG_NAME}" -m "Release ${VERSION_NAME} (${VERSION_CODE})"
git tag -a "${TAG_NAME}" -m "Release ${VERSION_NAME} (${VERSION_CODE})"
git push origin "${TAG_NAME}"
git push origin "${TAG_NAME}"
curl --silent -d "{\"token\": \"${JABBER_NOTIFICATION_TOKEN}\", \"message\": \"New tag for ${CI_PROJECT_PATH}: ${TAG_NAME}\"}" -H "Content-Type: application/json" -X POST ${JABBER_NOTIFICATION_URL}
fi
fi
android:deploy
:
android:deploy
:
...
...
This diff is collapsed.
Click to expand it.
android/gradle.properties
+
2
−
2
View file @
bbc0d6e4
org.gradle.jvmargs
=
-Xmx1536M
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableJetifier
=
true
app.versionName
=
0.0.
29
app.versionName
=
0.0.
30
app.versionCode
=
29
app.versionCode
=
30
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