Merge pull request #536 from mikepenz/develop

dev -> main
mikepenz · Nov 23, 2020 · 4ba0277 · 4ba0277
2 parents bf9f602 + 1102a94
commit 4ba0277
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,6 +10,9 @@ on:
       version:
         description: 'Version to build'
         required: true
+  push:
+    tags:
+      - '*'
   pull_request:
 
 jobs:
@@ -97,11 +100,11 @@ jobs:
           echo "openSource.signing.file=signing.gradle" >> local.properties
 
       - name: Build Release App
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && false
         run: ./gradlew app:assembleStaging app:assembleRelease app:bundleRelease
 
       - name: Relase bintray
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && false
         run: |
           ./gradlew build -x test -x lint
           ./gradlew library-typeface-api:bintrayUpload -x test -x lint -Plibrarytypefaceonly --no-configure-on-demand --no-parallel

diff --git a/release.sh b/release.sh
@@ -4,24 +4,24 @@
 
 if [ "$1" = "release" ];
 then
-    ./gradlew bintrayUpload -Plibrarytypefaceonly
+    ./gradlew bintrayUpload -x test -x lint -Plibrarytypefaceonly
     ./gradlew bintrayUpload -x test -x lint -Plibrarycoreonly
     ./gradlew bintrayUpload -x test -x lint -Plibraryviewsonly
 
-    #./gradlew build bintrayUpload -x test -x lint -Pcommunitymaterialonly
-    #./gradlew build bintrayUpload -x test -x lint -PDevIcononly
-    #./gradlew build bintrayUpload -x test -x lint -PEntypoonly
-    #./gradlew build bintrayUpload -x test -x lint -Pfontawesomeonly
-    #./gradlew build bintrayUpload -x test -x lint -PFoundationIconsonly
-    #./gradlew build bintrayUpload -x test -x lint -Pgooglematerialonly
-    #./gradlew build bintrayUpload -x test -x lint -PIoniconsonly
-    #./gradlew build bintrayUpload -x test -x lint -Pmaterialdesigniconiconly
-    #./gradlew build bintrayUpload -x test -x lint -Pmeteoconsonly
-    #./gradlew build bintrayUpload -x test -x lint -Pocticons
-    #./gradlew build bintrayUpload -x test -x lint -PPixeden7Strokeonly
-    #./gradlew build bintrayUpload -x test -x lint -PTypeiconsonly
-    #./gradlew build bintrayUpload -x test -x lint -Pweathericonsonly
-    #./gradlew build bintrayUpload -x test -x lint -Pmaterialdesigndxonly
+    # ./gradlew bintrayUpload -x test -x lint -Pcommunitymaterialonly
+    # ./gradlew bintrayUpload -x test -x lint -PDevIcononly
+    # ./gradlew bintrayUpload -x test -x lint -PEntypoonly
+    # ./gradlew bintrayUpload -x test -x lint -Pfontawesomeonly
+    # ./gradlew bintrayUpload -x test -x lint -PFoundationIconsonly
+    # ./gradlew bintrayUpload -x test -x lint -Pgooglematerialonly
+    # ./gradlew bintrayUpload -x test -x lint -PIoniconsonly
+    # ./gradlew bintrayUpload -x test -x lint -Pmaterialdesigniconiconly
+    # ./gradlew bintrayUpload -x test -x lint -Pmeteoconsonly
+    # ./gradlew bintrayUpload -x test -x lint -Pocticons
+    # ./gradlew bintrayUpload -x test -x lint -PPixeden7Strokeonly
+    # ./gradlew bintrayUpload -x test -x lint -PTypeiconsonly
+    # ./gradlew bintrayUpload -x test -x lint -Pweathericonsonly
+    # ./gradlew bintrayUpload -x test -x lint -Pmaterialdesigndxonly
 else
     echo todo
 fi