Merge pull request #32 from 6c65726f79/dev

Revert build.yml changes
6c65726f79 · Feb 15, 2021 · c6c4276 · c6c4276
2 parents 9e370bb + b9262c1
commit c6c4276
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 41 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,9 +1,8 @@
 name: Build
 
 on:
-  push:
-    branches:
-      - main
+  release:
+    types: [published]
 
   workflow_dispatch:
 
@@ -55,20 +54,14 @@ jobs:
           mv ./dist/ ./web/
           zip -r release.zip ./web/
 
-      - name: Get latest release
-        id: get_release
-        uses: agners/get-draft-release@v1.2.2
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
       - name: Upload Release Asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          upload_url: ${{ github.event.release.upload_url }}
           asset_path: ./release.zip
-          asset_name: Transmissionic-webui-${{ steps.get_release.outputs.tag_name }}.zip
+          asset_name: Transmissionic-webui-${{ github.event.release.tag_name }}.zip
           asset_content_type: application/zip
 
   build-electron-linux:
@@ -105,30 +98,24 @@ jobs:
         working-directory: ./electron
         run: npm run-script electron:build-linux
 
-      - name: Get latest release
-        id: get_release
-        uses: agners/get-draft-release@v1.2.2
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
       - name: Upload amd64 Release Asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./electron/dist/Transmissionic-linux-amd64-${{ steps.get_release.outputs.tag_name }}.deb
-          asset_name: Transmissionic-linux-amd64-${{ steps.get_release.outputs.tag_name }}.deb
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./electron/dist/Transmissionic-linux-amd64-${{ github.event.release.tag_name }}.deb
+          asset_name: Transmissionic-linux-amd64-${{ github.event.release.tag_name }}.deb
           asset_content_type: application/octet-stream
 
       - name: Upload i386 Release Asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./electron/dist/Transmissionic-linux-i386-${{ steps.get_release.outputs.tag_name }}.deb
-          asset_name: Transmissionic-linux-i386-${{ steps.get_release.outputs.tag_name }}.deb
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./electron/dist/Transmissionic-linux-i386-${{ github.event.release.tag_name }}.deb
+          asset_name: Transmissionic-linux-i386-${{ github.event.release.tag_name }}.deb
           asset_content_type: application/octet-stream
 
   build-electron-win:
@@ -165,20 +152,14 @@ jobs:
         working-directory: ./electron
         run: npm run-script electron:build-windows
 
-      - name: Get latest release
-        id: get_release
-        uses: agners/get-draft-release@v1.2.2
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
       - name: Upload Release Asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./electron/dist/Transmissionic-win-${{ steps.get_release.outputs.tag_name }}.exe
-          asset_name: Transmissionic-win-${{ steps.get_release.outputs.tag_name }}.exe
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./electron/dist/Transmissionic-win-${{ github.event.release.tag_name }}.exe
+          asset_name: Transmissionic-win-${{ github.event.release.tag_name }}.exe
           asset_content_type: application/octet-stream
 
   build-android:
@@ -225,19 +206,13 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
         env:
           BUILD_TOOLS_VERSION: "30.0.2"
-
-      - name: Get latest release
-        id: get_release
-        uses: agners/get-draft-release@v1.2.2
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
 
       - name: Upload Release Asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          upload_url: ${{ github.event.release.upload_url }}
           asset_path: ${{steps.sign_app.outputs.signedReleaseFile}}
-          asset_name: Transmissionic-android-${{ steps.get_release.outputs.tag_name }}.apk
+          asset_name: Transmissionic-android-${{ github.event.release.tag_name }}.apk
           asset_content_type: application/zip
diff --git a/src/views/ServerDetails.vue b/src/views/ServerDetails.vue
@@ -43,7 +43,7 @@
 
         <ion-item>
           <ion-label position="floating">{{ Locale.rpcPath }}</ion-label>
-          <ion-input v-model="newConf.path" placeholder="/transmission/rpc/"></ion-input>
+          <ion-input v-model="newConf.path" placeholder="/transmission/rpc"></ion-input>
         </ion-item>
 
         <ion-item>