Skip to content

Commit a6c6ad4

Browse files
authored
chore: updated github actions and pull request template (#2228)
1 parent bbf9056 commit a6c6ad4

File tree

4 files changed

+28
-19
lines changed

4 files changed

+28
-19
lines changed

.github/PULL_REQUEST_TEMPLATE

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
Fixes #[Add issue number here. Note: This will automatically closes the issue. If you do not solve the issue entirely, please change the message to e.g. "First steps for issues #IssueNumber]
1+
**Fixes** #<!-- Add issue number here. This will automatically closes the issue. If you do not solve the issue entirely, please change the message to e.g. "First steps for issues #IssueNumber" -->
22

3-
**Changes**: [Add here what changes were made in this issue and if possible provide links.]
3+
**Changes**:
4+
- <!-- Add here what changes were made in this issue and if possible provide links. -->
45

5-
**Screenshot/s for the changes**: [Add screenshot/s of the layout where you made changes or a `*.gif` containing a demonstration]
6+
**Screen shots for the changes**:
7+
<!-- Add screen shots/screen recordings of the layout where you made changes or a `*.gif` containing a demonstration -->
68

7-
**Checklist**: [Please tick following check boxes with `[x]` if the respective task is completed]
8-
- [ ] I have used resources from `strings.xml`, `dimens.xml` and `colors.xml` without hard-coding them
9-
- [ ] No modifications done at the end of resource files `strings.xml`, `dimens.xml` or `colors.xml`
10-
- [ ] I have reformatted code in every file included in this PR [<kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>L</kbd>]
11-
- [ ] My code does not contain any extra lines or extra spaces
12-
- [ ] I have requested reviews from other members
13-
14-
**APK for testing**: [Compress the `app-debug.apk` file into a `<feature>.rar` or `<feature>.zip` file and upload it here]
9+
**Checklist**: <!-- Please tick following check boxes with `[x]` if the respective task is completed -->
10+
- [ ] I have used resources from `strings.xml`, `dimens.xml` and `colors.xml` without hard-coding any value.
11+
- [ ] No modifications done at the end of resource files `strings.xml`, `dimens.xml` or `colors.xml`.
12+
- [ ] I have reformatted code and fixed indentation in every file included in this pull request
13+
- [ ] My code does not contain any extra lines or extra spaces.
14+
- [ ] I have requested reviews from maintainers.

.github/workflows/pull-request.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
name: pslab-android-pull-requests
1+
name: Build
22

33
on:
4+
push:
5+
branches:
6+
- master
47
pull_request:
5-
branches: [ development ]
8+
branches:
9+
- master
10+
- development
611

712
jobs:
813
build:
@@ -23,7 +28,11 @@ jobs:
2328
run: bash ./gradlew build --stacktrace
2429

2530
- name: Upload APK
26-
uses: actions/upload-artifact@v1
31+
uses: actions/upload-artifact@v2
2732
with:
28-
name: pslab-android-debug-apk
29-
path: app/build/outputs/apk/debug/app-debug.apk
33+
name: pslab-android-apk
34+
path: |
35+
app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
36+
app/build/outputs/apk/fdroid/release/app-fdroid-release-unsigned.apk
37+
app/build/outputs/apk/playstore/debug/app-playstore-debug.apk
38+
app/build/outputs/apk/playstore/release/app-playstore-release-unsigned.apk

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
maven { url "https://plugins.gradle.org/m2/" }
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.3.2'
11+
classpath 'com.android.tools.build:gradle:4.1.3'
1212
classpath "io.realm:realm-gradle-plugin:5.8.0"
1313
classpath "gradle.plugin.com.github.b3er.local.properties:local-properties-plugin:1.1"
1414
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Mar 19 16:28:50 IST 2019
1+
#Mon Oct 04 22:33:05 CEST 2021
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

0 commit comments

Comments
 (0)