-
Notifications
You must be signed in to change notification settings - Fork 803
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2317 from fossasia/development
chore: merge development branch into master branch
- Loading branch information
Showing
229 changed files
with
10,419 additions
and
3,078 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| 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] | ||
| **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" --> | ||
|
|
||
| **Changes**: [Add here what changes were made in this issue and if possible provide links.] | ||
| **Changes**: | ||
| - <!-- Add here what changes were made in this issue and if possible provide links. --> | ||
|
|
||
| **Screenshot/s for the changes**: [Add screenshot/s of the layout where you made changes or a `*.gif` containing a demonstration] | ||
| **Screen shots for the changes**: | ||
| <!-- Add screen shots/screen recordings of the layout where you made changes or a `*.gif` containing a demonstration --> | ||
|
|
||
| **Checklist**: [Please tick following check boxes with `[x]` if the respective task is completed] | ||
| - [ ] I have used resources from `strings.xml`, `dimens.xml` and `colors.xml` without hard-coding them | ||
| - [ ] No modifications done at the end of resource files `strings.xml`, `dimens.xml` or `colors.xml` | ||
| - [ ] I have reformatted code in every file included in this PR [<kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>L</kbd>] | ||
| - [ ] My code does not contain any extra lines or extra spaces | ||
| - [ ] I have requested reviews from other members | ||
|
|
||
| **APK for testing**: [Compress the `app-debug.apk` file into a `<feature>.rar` or `<feature>.zip` file and upload it here] | ||
| **Checklist**: <!-- Please tick following check boxes with `[x]` if the respective task is completed --> | ||
| - [ ] I have used resources from `strings.xml`, `dimens.xml` and `colors.xml` without hard-coding any value. | ||
| - [ ] No modifications done at the end of resource files `strings.xml`, `dimens.xml` or `colors.xml`. | ||
| - [ ] I have reformatted code and fixed indentation in every file included in this pull request | ||
| - [ ] My code does not contain any extra lines or extra spaces. | ||
| - [ ] I have requested reviews from maintainers. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: "github-actions" | ||
| directory: "/" | ||
| schedule: | ||
| interval: "weekly" | ||
| reviewers: | ||
| - "mariobehling" | ||
| - "cloudypadmal" | ||
|
|
||
| - package-ecosystem: "gradle" | ||
| directory: "/" | ||
| schedule: | ||
| interval: "weekly" | ||
| reviewers: | ||
| - "mariobehling" | ||
| - "cloudypadmal" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| name: Build | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - master | ||
| - development | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Download repository | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup Java | ||
| uses: actions/setup-java@v2 | ||
| with: | ||
| distribution: 'adopt' | ||
| java-version: '11' | ||
|
|
||
| - name: Build with Gradle | ||
| run: | | ||
| bash ./gradlew build --stacktrace |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| name: Push | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - development | ||
|
|
||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| branch: ${{ steps.branch-name.outputs.current_branch }} | ||
|
|
||
| steps: | ||
| - name: Download repository | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup Java | ||
| uses: actions/setup-java@v2 | ||
| with: | ||
| distribution: 'adopt' | ||
| java-version: '11' | ||
|
|
||
| - name: Build with Gradle | ||
| run: | | ||
| bash ./gradlew build --stacktrace | ||
| bash ./gradlew bundle --stacktrace | ||
| - name: Store APK files | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: apk-files | ||
| path: | | ||
| app/build/outputs/apk/debug/app-debug.apk | ||
| app/build/outputs/apk/release/app-release-unsigned.apk | ||
| app/build/outputs/bundle/debug/app-debug.aab | ||
| app/build/outputs/bundle/release/app-release.aab | ||
| - name: Define branch | ||
| id: branch-name | ||
| run: echo "::set-output name=current_branch::${{ github.ref_name }}" | ||
|
|
||
| upload: | ||
| needs: build | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Clone APK branch | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| repository: fossasia/pslab-android | ||
| ref: apk | ||
|
|
||
| - name: Clean APK branch for master builds | ||
| if: ${{ needs.build.outputs.branch == 'master' }} | ||
| run: | | ||
| rm -rf app-debug-master.apk || true | ||
| rm -rf app-release-unsigned-master.apk || true | ||
| rm -rf app-debug-master.aab || true | ||
| rm -rf app-release-master.aab || true | ||
| - name: Clean APK branch for development builds | ||
| if: ${{ needs.build.outputs.branch == 'development' }} | ||
| run: | | ||
| rm -rf app-debug-development.apk || true | ||
| rm -rf app-release-unsigned-development.apk || true | ||
| rm -rf app-debug-development.aab || true | ||
| rm -rf app-release-development.aab || true | ||
| - name: Retrieve APK files | ||
| uses: actions/download-artifact@v2 | ||
| with: | ||
| name: apk-files | ||
|
|
||
| - name: Rename files in master branch | ||
| if: ${{ needs.build.outputs.branch == 'master' }} | ||
| run: | | ||
| mv apk/debug/app-debug.apk app-debug-master.apk | ||
| mv apk/release/app-release-unsigned.apk app-release-unsigned-master.apk | ||
| mv bundle/debug/app-debug.aab app-debug-master.aab | ||
| mv bundle/release/app-release.aab app-release-master.aab | ||
| - name: Rename files in development branch | ||
| if: ${{ needs.build.outputs.branch == 'development' }} | ||
| run: | | ||
| mv apk/debug/app-debug.apk app-debug-development.apk | ||
| mv apk/release/app-release-unsigned.apk app-release-unsigned-development.apk | ||
| mv bundle/debug/app-debug.aab app-debug-development.aab | ||
| mv bundle/release/app-release.aab app-release-development.aab | ||
| - name: Setup credentials | ||
| run: | | ||
| git config user.name 'github-actions[bot]' | ||
| git config user.email 'github-actions[bot]@users.noreply.github.com' | ||
| - name: Update APK branch | ||
| run: | | ||
| git remote set-url --push origin https://github-actions[bot]:[email protected]/${GITHUB_REPOSITORY} | ||
| git checkout --orphan temporary | ||
| git add . | ||
| git commit -m "release: build files from ${{ needs.build.outputs.branch }} branch" | ||
| git branch -D apk | ||
| git branch -m apk | ||
| git push origin apk -f --quiet > /dev/null | ||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.