Merge devTagPublish.yml into bintray.yml

.github/workflows/bintray.yml

@@ -6,7 +6,10 @@ name: Bintray Publish
 # events but only for the master branch
 on:
   release:
-    types: [created, prereleased]
+    types: [ created, prereleased ]
+  push:
+    tags:
+      - '*-dev*'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

.github/workflows/devTagPublish.yml

@@ -1,76 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Dev Tag Publish
-
-# Controls when the action will run. Triggers the workflow on push or pull request 
-# events but only for the master branch
-on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - '*-dev*'
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Gradle clean
-        run: ./gradlew clean
-      - name: Gradle build
-        run: ./gradlew build # if test's failed, don't publish
-
-      - name: Check keys
-        run: >-
-          ./gradlew :mirai-core-utils:ensureBintrayAvailable
-          :mirai-core-api:ensureBintrayAvailable
-          :mirai-core:ensureBintrayAvailable
-          -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }}
-          -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }}
-
-      - name: Gradle :mirai-core-utils:publish
-        run: >-
-          ./gradlew :mirai-core-utils:publish --info
-          -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }}
-          -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }}
-
-      - name: Gradle :mirai-core-api:publish
-        run: >-
-          ./gradlew :mirai-core-api:publish --info
-          -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }}
-          -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }}
-
-      - name: Gradle :mirai-core:publish
-        run: >-
-          ./gradlew :mirai-core:publish --info
-          -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }}
-          -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }}
-
-      - name: Gradle :mirai-core-all:bintrayUpload
-        run: >-
-          ./gradlew :mirai-core-all:bintrayUpload
-          -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }}
-          -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }}
-
-#      - name: Upload artifact
-#        uses: actions/upload-artifact@v1.0.0
-#        with:
-#          # Artifact name
-#          name: mirai-core
-#          # Directory containing files to upload
-#          path: "mirai-core/build/libs/mirai-core-*-all.jar"
-#      - name: Upload artifact
-#        uses: actions/upload-artifact@v1.0.0
-#        with:
-#          # Artifact name
-#          name: mirai-core-qqandroid-all
-#          # Directory containing files to upload
-#          path: "mirai-core-qqandroid/build/libs/mirai-core-qqandroid-*-all.jar"