Updated deploy and removed container

.github/workflows/build.yml

@@ -6,13 +6,12 @@ jobs:
   build:
     name: Create And Upload Release
     runs-on: ubuntu-latest
-    container: 7cav/armake
     environment: 
       name: production
     steps:
 
       - name: Install dependencies
-        run: apk add curl python3 sshpass
+        run: sudo apt install curl
 
       - name: Clone repo
         uses: actions/checkout@master
@@ -41,6 +40,7 @@ jobs:
       #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Uploading to Server
+        if: "!github.event.release.prerelease"
         uses: Dylan700/sftp-upload-action@latest
         with:
           server: ${{ secrets.SERVER }}

.github/workflows/testing.yml

@@ -1,5 +1,11 @@
 name: Testing
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, ready_for_review]
+
 jobs:
   testing:
     runs-on: ubuntu-latest

build.py

@@ -28,7 +28,7 @@
     prog='build',
     formatter_class=argparse.RawDescriptionHelpFormatter,
     description='This script generates sandbox or training missions.',
-    epilog='This build script generates sandboxes or training maps bases on provided templates.\nThe tool should be cross platform and requires armake to function.'
+    epilog='This build script generates sandboxes or training maps bases on provided templates.\nThe tool should be cross platform and requires armake2 to function.'
 )
 
 parser.add_argument('buildType',
@@ -100,7 +100,7 @@ def color_string(string='', color='\033[0m', use_color=False):
 def build_pbo(temp_folder='', pbo_name='unnamed', use_color=False):
     os.chdir(scriptDir)
     print('Building and compiling {}...'.format(color_string('{}.pbo'.format(pbo_name),'\033[96m',use_color)))
-    subprocess.call('armake build -f -p "{}" "output/{}.pbo"'.format(os.path.join(temp_folder, "."),pbo_name), shell=True)
+    subprocess.call('armake2 build -f "{}" "output/{}.pbo"'.format(os.path.join(temp_folder, "."),pbo_name), shell=True)
 
 
 def build_archive(archive_name='unnamed', archive_type='zip', archive_input='', use_color=False):

deploy.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+PATH=$PWD:$PATH
+
 VERSION_TAG=$*
 
 echo "Checking and downloading latest version of cScripts..."