From 274266630f375001cb6f6ac27bc800e60d80f718 Mon Sep 17 00:00:00 2001 From: Carlos Polop Date: Thu, 15 Jul 2021 22:56:22 +0100 Subject: [PATCH 1/5] Update CI-winpeas_dev_test.yml --- .github/workflows/CI-winpeas_dev_test.yml | 43 ++--------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/.github/workflows/CI-winpeas_dev_test.yml b/.github/workflows/CI-winpeas_dev_test.yml index 33614a5..f6a8d66 100644 --- a/.github/workflows/CI-winpeas_dev_test.yml +++ b/.github/workflows/CI-winpeas_dev_test.yml @@ -5,51 +5,12 @@ on: 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 - - +jobs: create_pull_request: runs-on: ubuntu-latest - needs: Build_and_test_winpeas_dev steps: # checkout @@ -62,4 +23,4 @@ jobs: with: destination_branch: "master" github_token: ${{ secrets.PULL_REQUEST_TOKEN }} - \ No newline at end of file + From f777f20b967f4e5f49b16700602e1feef318ab31 Mon Sep 17 00:00:00 2001 From: Carlos Polop Date: Thu, 15 Jul 2021 22:56:39 +0100 Subject: [PATCH 2/5] Update CI-winpeas_dev_test.yml --- .github/workflows/CI-winpeas_dev_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-winpeas_dev_test.yml b/.github/workflows/CI-winpeas_dev_test.yml index f6a8d66..af2feb7 100644 --- a/.github/workflows/CI-winpeas_dev_test.yml +++ b/.github/workflows/CI-winpeas_dev_test.yml @@ -1,4 +1,4 @@ -name: CI-winpeas_dev_test +name: CI-PR_from_dev on: push: From 4f63b70089919d2058b65786c340c076dcf7280f Mon Sep 17 00:00:00 2001 From: Carlos Polop Date: Thu, 15 Jul 2021 22:57:05 +0100 Subject: [PATCH 3/5] Delete CI-linpeas_dev_test.yml --- .github/workflows/CI-linpeas_dev_test.yml | 61 ----------------------- 1 file changed, 61 deletions(-) delete mode 100644 .github/workflows/CI-linpeas_dev_test.yml diff --git a/.github/workflows/CI-linpeas_dev_test.yml b/.github/workflows/CI-linpeas_dev_test.yml deleted file mode 100644 index 0ed5f40..0000000 --- a/.github/workflows/CI-linpeas_dev_test.yml +++ /dev/null @@ -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 From 5f3fae67f8dbb66e8703e0a520c16bbf42ad93b2 Mon Sep 17 00:00:00 2001 From: Carlos Polop Date: Thu, 15 Jul 2021 22:57:32 +0100 Subject: [PATCH 4/5] Rename CI-winpeas_dev_test.yml to CI-PR_from_dev.yml --- .github/workflows/{CI-winpeas_dev_test.yml => CI-PR_from_dev.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{CI-winpeas_dev_test.yml => CI-PR_from_dev.yml} (100%) diff --git a/.github/workflows/CI-winpeas_dev_test.yml b/.github/workflows/CI-PR_from_dev.yml similarity index 100% rename from .github/workflows/CI-winpeas_dev_test.yml rename to .github/workflows/CI-PR_from_dev.yml From 3c64a88fba0e60d3d7dcc9ce0baeec82f2d76012 Mon Sep 17 00:00:00 2001 From: Carlos Polop Date: Thu, 15 Jul 2021 23:00:14 +0100 Subject: [PATCH 5/5] Update and rename CI-winpeas_master_test.yml to CI-master_tests.yml --- ...as_master_test.yml => CI-master_tests.yml} | 52 ++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) rename .github/workflows/{CI-winpeas_master_test.yml => CI-master_tests.yml} (75%) diff --git a/.github/workflows/CI-winpeas_master_test.yml b/.github/workflows/CI-master_tests.yml similarity index 75% rename from .github/workflows/CI-winpeas_master_test.yml rename to .github/workflows/CI-master_tests.yml index aa4a97a..5b59583 100644 --- a/.github/workflows/CI-winpeas_master_test.yml +++ b/.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