Merge branch 'master' into Blake-TU

7Cav · May 17, 2020 · 65959dc · 65959dc
2 parents b22f596 + 8a646b1
commit 65959dc
Show file tree

Hide file tree

Showing 21 changed files with 5,373 additions and 44 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -13,24 +13,15 @@ jobs:
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
 
+      - name: Install dependencies
+        run: |
+          sudo add-apt-repository ppa:koffeinflummi/armake -y
+          sudo apt update -y
+          sudo apt install armake -y
+
       - name: Build release
         run: ./tools/deploy.sh ${{ steps.get_version.outputs.VERSION }}
 
-      # - name: Create Release
-      #   id: create_release
-      #   uses: actions/create-release@v1
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     tag_name: ${{ github.ref }}
-      #     release_name: Release ${{ github.ref }}
-      #     body: |
-      #       Changes in this Release
-      #       - First Change
-      #       - Second Change
-      #     draft: false
-      #     prerelease: false
-
       - name: Upload Release cScripts
         uses: JasonEtco/upload-to-release@master
         with:
@@ -43,9 +34,23 @@ jobs:
           args: release/cScripts_PUBLIC-${{ steps.get_version.outputs.VERSION }}.zip application/zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload Release cScripts (PATCH)
+        continue-on-error: true
+        uses: JasonEtco/upload-to-release@master
+        with:
+          args: release/cScripts_PATCH_v* application/zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload Release cScripts (Compositions)
         uses: JasonEtco/upload-to-release@master
         with:
           args: release/Compositions-${{ steps.get_version.outputs.VERSION }}.zip application/zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload Release CBA Settings Server Config
+        continue-on-error: true
+        uses: JasonEtco/upload-to-release@master
+        with:
+          args: release/Server_Config-${{ steps.get_version.outputs.VERSION }}.zip application/zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}