Merge branch 'master' into linpeas_dev

.github/workflows/CI-PR_from_dev.yml

@@ -0,0 +1,26 @@
+name: CI-PR_from_dev
+
+on:
+  push:
+    branches:
+      - winpeas_dev
+      - linpeas_dev
+
+  workflow_dispatch:
+
+jobs:     
+  create_pull_request:
+    runs-on: ubuntu-latest
+    
+    steps:
+      # checkout
+      - name: Checkout
+        uses: actions/checkout@v2
+    
+      # PR     
+      - name: Pull Request
+        uses: repo-sync/pull-request@v2
+        with:
+          destination_branch: "master"
+          github_token: ${{ secrets.PULL_REQUEST_TOKEN }}
+      

.github/workflows/CI-linpeas_dev_test.yml

@@ -1,61 +0,0 @@
-name: CI-linpeas_dev_test
-
-on:
-  push:
-    branches:
-      - linpeas_dev
-
-  workflow_dispatch:
-
-jobs:
-  Build_and_test_linpeas_dev:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Build linpeas
-        run: |
-          python3 -m pip install PyYAML
-          cd linPEAS
-          python3 -m builder.linpeas_builder
-
-      - name: Run linpeas
-        run: linPEAS/linpeas.sh
-
-      - name: Create local changes
-        run: git add linPEAS/linpeas.sh
-
-      - name: Commit results to Github
-        run: |
-          git config --local user.email ""
-          git config --global user.name "CI-linpeas-ubuntu"
-          git commit -m "linpeas.sh auto update" -a --allow-empty
-      
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-           github_token: ${{ secrets.GITHUB_TOKEN }}
-           branch: ${{ github.ref }}
-
-      - uses: actions/checkout@v2
-      - name: pull-request
-        uses: repo-sync/pull-request@v2
-        with:
-          destination_branch: "master"
-          github_token: ${{ secrets.PULL_REQUEST_TOKEN }}
-
-  Build_and_test_macpeas_dev:
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Build macpeas
-        run: |
-          python3 -m pip install PyYAML
-          cd linPEAS
-          python3 -m builder.linpeas_builder
-
-      - name: Run macpeas
-        run: linPEAS/linpeas.sh -o SofI

.github/workflows/CI-master_tests.yml

@@ -1,4 +1,4 @@
-name: CI-winpeas_master_test
+name: CI-master_test
 
 on:
   pull_request:
@@ -105,9 +105,59 @@ jobs:
           git config --global user.name "CI-winpeas"
           git commit -m "winpeas binaries auto update" -a --allow-empty
       
+      # Git Pull
+      - name: Pull possible previous changes
+        run: git pull
+      
       # Git push
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:
            github_token: ${{ secrets.GITHUB_TOKEN }}
            branch: master
+
+  Build_and_test_linpeas_master:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build linpeas
+        run: |
+          python3 -m pip install PyYAML
+          cd linPEAS
+          python3 -m builder.linpeas_builder
+      - name: Run linpeas
+        run: linPEAS/linpeas.sh
+
+      - name: Create local changes
+        run: git add linPEAS/linpeas.sh
+
+      - name: Commit results to Github
+        run: |
+          git config --local user.email ""
+          git config --global user.name "CI-linpeas-ubuntu"
+          git commit -m "linpeas.sh auto update" -a --allow-empty
+          
+      - name: Pull possible previous changes
+        run: git pull
+      
+      - name: Push changes
+        uses: ad-m/github-push-action@master
+        with:
+           github_token: ${{ secrets.GITHUB_TOKEN }}
+           branch: ${{ github.ref }}
+
+  Build_and_test_macpeas_master:
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build macpeas
+        run: |
+          python3 -m pip install PyYAML
+          cd linPEAS
+          python3 -m builder.linpeas_builder
+      - name: Run macpeas
+        run: linPEAS/linpeas.sh -o SysI,Container,Devs,AvaSof,ProCronSrvcsTmrsSocks,Net,UsrI,SofI

.github/workflows/CI-winpeas_dev_test.yml

@@ -1,65 +0,0 @@
-name: CI-winpeas_dev_test
-
-on:
-  push:
-    branches:
-      - winpeas_dev
-      - linpeas_dev
-    paths:
-      - 'build_lists/sensitive_files.yaml'
-      - 'winPEAS/winPEASexe/**'
-
-  workflow_dispatch:
-
-jobs:
-
-  Build_and_test_winpeas_dev:
-    runs-on: windows-latest
-    
-    # environment variables
-    env:
-      Solution_Path: 'winPEAS\winPEASexe\winPEAS.sln'
-      Configuration: 'Release'
-
-    steps:
-      # checkout
-      - name: Checkout
-        uses: actions/checkout@v2
-            
-      # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
-      - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.0.2
-       
-      # Setup NuGet
-      - name: Setup NuGet.exe
-        uses: nuget/setup-nuget@v1  
-        
-      # Restore the packages for testing
-      - name: Restore the application       
-        run: nuget restore $env:Solution_Path
-        
-      # build
-      - name: run MSBuild
-        run: msbuild $env:Solution_Path
-        
-      # Execute all unit tests in the solution
-      - name: Execute unit tests
-        run: dotnet test $env:Solution_Path
-      
-      
-  create_pull_request:
-    runs-on: ubuntu-latest
-    needs: Build_and_test_winpeas_dev
-    
-    steps:
-      # checkout
-      - name: Checkout
-        uses: actions/checkout@v2
-    
-      # PR     
-      - name: Pull Request
-        uses: repo-sync/pull-request@v2
-        with:
-          destination_branch: "master"
-          github_token: ${{ secrets.PULL_REQUEST_TOKEN }}
-