fix(build): fix release

Signed-off-by: Teclib <[email protected]>

Author: stonebuzz

.circleci/config.yml

@@ -160,7 +160,7 @@ jobs:
           command: source ci/scripts/setup_environment.sh
       - run:
           name: Update version code
-          command: ./gradlew updateVersionCode -P vVersion=$CIRCLE_BUILD_NUM
+          command: ./gradlew updateVersionCode
       - run:
           name: Update version name
           command: ./gradlew updateVersionName -P vName=$GIT_TAG

CHANGELOG.md

@@ -123,7 +123,7 @@ guidelines for [contributing](./CONTRIBUTING.md)
 
 ## Issues / request features
 
-Want to report a bug or request feature, please contact us [Here](https://portal.glpi-network.com/contactez-nous)
+Want to report a bug or request feature, please contact us [here](https://portal.glpi-network.com/contactez-nous)
 
 
 ## Copying

README.md

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.glpi.inventory.agent"
-    android:versionCode="39241"
+    android:versionCode="39261"
     android:versionName="">
 
     <!-- Permissions -->

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
-about.version=1.0.0-rc.2
-about.build=39241
-about.date=Mon Jan 06 14:19:41 2020
-about.commit=95f7696
-about.commitFull=95f76961dfdfd35dcc53b5a3ce349e4f0d19e80b
+about.version=1.0.0
+about.build=39261
+about.date=mar. janv. 07 12:16:53 2020
+about.commit=
+about.commitFull=
 about.github=https://github.com/glpi-project/android-inventory-agent

app/src/main/assets/about.properties

@@ -41,7 +41,6 @@ if [[ $GH_COMMIT_MESSAGE != *"ci(release): generate CHANGELOG.md for version"* &
 
     # Get the version number from package.json
     export GIT_TAG=$(jq -r ".version" package.json)
-
     # get if is a release or a pre release with "-"
     IS_PRERELEASE="$( cut -d '-' -f 2 <<< "$GIT_TAG" )";
 

ci/scripts/deploy_production.sh

@@ -36,6 +36,7 @@
 
 # Get version number from package.json
 export GIT_TAG=$(jq -r ".version" package.json)
+export GITHUB_TOKEN=$GH_TOKEN
 
 # Generate CHANGELOG.md and increment version
 IS_PRERELEASE="$( cut -d '-' -f 2 <<< "$GIT_TAG" )";
@@ -69,33 +70,31 @@ git checkout . -f
 git push --follow-tags origin $CIRCLE_BRANCH
 
 # Create release with conventional-github-releaser
-yarn conventional-github-releaser -p angular -t $GH_TOKEN
+yarn conventional-github-releaser -p angular -t $GH_TOKEN 2> /dev/null || true
 
 # get apk path
-export FILE="./app/build/outputs/apk/release/appCertified.apk"
+# export FILE="./app/build/outputs/apk/release/appCertified.apk"
 
-if [[ $CIRCLE_BRANCH != "$IS_PRERELEASE" ]]; then
+#if [[ $CIRCLE_BRANCH != "$IS_PRERELEASE" ]]; then
 
     # Upload release
-    yarn github-release upload \
-    --user "${CIRCLE_PROJECT_USERNAME}" \
-    --repo "${CIRCLE_PROJECT_REPONAME}" \
-    --tag "${GIT_TAG}" \
-    --name "InventoryAgent-${GIT_TAG}.apk" \
-    --file ${FILE}
+#     yarn github-release upload \
+#     --user "${CIRCLE_PROJECT_USERNAME}" \
+#     --repo "${CIRCLE_PROJECT_REPONAME}" \
+#     --tag "${GIT_TAG}" \
+#     --name "InventoryAgent-${GIT_TAG}.apk"
 
-else
+# else
 
     # Upload pre-release
-    yarn github-release upload \
-    --user "${CIRCLE_PROJECT_USERNAME}" \
-    --repo "${CIRCLE_PROJECT_REPONAME}" \
-    --tag "${GIT_TAG}" \
-    --name "InventoryAgent-${GIT_TAG}.apk" \
-    --file ${FILE} \
-    --pre-release
-
-fi
+#     yarn github-release upload \
+#     --user "${CIRCLE_PROJECT_USERNAME}" \
+#     --repo "${CIRCLE_PROJECT_REPONAME}" \
+#     --tag "${GIT_TAG}" \
+#     --name "InventoryAgent-${GIT_TAG}.apk" \
+#     --pre-release
+
+# fi
 
 # Update develop branch
 git add .

ci/scripts/release.sh

@@ -1,6 +1,6 @@
 {
   "name": "@teclib/android-inventory-agent",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0",
   "description": "GLPI Android Inventory Agent",
   "main": "index.js",
   "scripts": {