Browse Source

Github migration changes

pull/24/head
Ezerous 7 years ago
parent
commit
50337daf5b
  1. 39
      .gitlab-ci.yml
  2. 18
      CONTRIBUTING.md
  3. 1
      README.md

39
.gitlab-ci.yml

@ -1,39 +0,0 @@
image: openjdk:8-jdk
variables:
ANDROID_TARGET_SDK: "27"
ANDROID_BUILD_TOOLS: "27.0.3"
ANDROID_SDK_TOOLS_REV: "3859397"
before_script:
- apt-get --quiet update --yes
- apt-get --quiet install --yes wget unzip lib32stdc++6 lib32z1
- mkdir $HOME/.android # for sdkmanager configs
- echo 'count=0' > $HOME/.android/repositories.cfg # avoid warning
- wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS_REV}.zip
- mkdir $PWD/android-sdk-linux
- unzip -qq android-sdk.zip -d $PWD/android-sdk-linux
- export ANDROID_HOME=$PWD/android-sdk-linux
- echo y | $ANDROID_HOME/tools/bin/sdkmanager --update > /dev/null
- echo y | $ANDROID_HOME/tools/bin/sdkmanager 'tools' > /dev/null
- echo y | $ANDROID_HOME/tools/bin/sdkmanager 'platform-tools' > /dev/null
- echo y | $ANDROID_HOME/tools/bin/sdkmanager 'build-tools;'$ANDROID_BUILD_TOOLS > /dev/null
- echo y | $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-'$ANDROID_TARGET_SDK > /dev/null
- echo y | $ANDROID_HOME/tools/bin/sdkmanager 'extras;android;m2repository' > /dev/null
- echo y | $ANDROID_HOME/tools/bin/sdkmanager 'extras;google;google_play_services' > /dev/null
- echo y | $ANDROID_HOME/tools/bin/sdkmanager 'extras;google;m2repository' > /dev/null
- chmod +x ./gradlew
stages:
- build
build:
stage: build
script:
- ./gradlew assembleDebug > /dev/null
except:
- master
artifacts:
name: "${CI_BUILD_NAME}"
paths:
- app/build/outputs/

18
CONTRIBUTING.md

@ -16,7 +16,7 @@ There are many ways of contributing to mTHMMY:
- Simply using the [latest release version][google-play] from Google Play (anonymous reports are sent automatically)
- Joining our [Discord server][discord-server]
- Submitting bugs and ideas on our [Trello board][trello-board]
- Forking mTHMMY and submitting [merge requests](#merge-requests)
- Forking mTHMMY and submitting [pull requests](#pull-requests)
- Joining our core team
- Contacting us by email at `thmmynolife@gmail.com`
@ -25,18 +25,18 @@ There are many ways of contributing to mTHMMY:
The [mTHMMY Board on trello.com][trello-board] is used as an Issue Tracker, for bugs and improvements concerning the available mTHMMY releases.
Before creating a card to submit an issue please **search the board** for similar entries.
## Merge requests
## Pull requests
Merge requests with fixes and improvements to mTHMMY are most welcome. Any developer that wants to work independently from the core team can simply
follow the workflow below to make a merge request:
Pull requests with fixes and improvements to mTHMMY are most welcome. Any developer that wants to work independently from the core team can simply
follow the workflow below to make a pull request:
1. Fork the project into your personal space on GitLab.com
1. Fork the project into your personal space on Github
1. Create a feature branch, away from `develop`
1. Push the commit(s) to your fork
1. Create a merge request (MR) targeting `develop` [at mTHMMY](https://gitlab.com/ThmmyNoLife/mTHMMY/tree/develop)
1. Fill the MR title describing the change you want to make
1. Fill the MR description with a brief motive for your change and the method you used to achieve it
1. Submit the MR.
1. Create a pull request (PR) targeting `develop` [at mTHMMY](https://github.com/ThmmyNoLife/mTHMMY/tree/develop)
1. Fill the PR title describing the change you want to make
1. Fill the PR description with a brief motive for your change and the method you used to achieve it
1. Submit the PR.

1
README.md

@ -1,6 +1,5 @@
# mTHMMY
[![build status](https://gitlab.com/ThmmyNoLife/mTHMMY/badges/develop/build.svg)](https://gitlab.com/ThmmyNoLife/mTHMMY/commits/develop)
[![API](https://img.shields.io/badge/API-19%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=19)
[![Discord Channel](https://img.shields.io/badge/discord-public@mTHMMY-738bd7.svg?style=flat)][discord-server]
[![Trello Board](https://img.shields.io/badge/trello-mTHMMY-red.svg?style=flat)][trello-board]

Loading…
Cancel
Save