diff --git a/.github/workflows/CI-linpeas_master_test.yml b/.github/workflows/CI-linpeas_master_test.yml deleted file mode 100644 index 32f9790..0000000 --- a/.github/workflows/CI-linpeas_master_test.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: CI-linpeas_master_test - -on: - pull_request: - branches: - - master - - workflow_dispatch: - -jobs: - 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: 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 diff --git a/.github/workflows/CI-master_tests.yml b/.github/workflows/CI-master_tests.yml index 5b59583..8271638 100644 --- a/.github/workflows/CI-master_tests.yml +++ b/.github/workflows/CI-master_tests.yml @@ -11,6 +11,7 @@ jobs: Build_and_test_winpeas_master: runs-on: windows-latest + needs: Build_and_test_linpeas_master # environment variables env: @@ -21,7 +22,9 @@ jobs: steps: # checkout - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@master + with: + fetch-depth: 0 # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - name: Setup MSBuild.exe @@ -105,22 +108,21 @@ 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 + branch: ${{ github.ref }} Build_and_test_linpeas_master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@master + with: + fetch-depth: 0 - name: Build linpeas run: | @@ -128,7 +130,7 @@ jobs: cd linPEAS python3 -m builder.linpeas_builder - name: Run linpeas - run: linPEAS/linpeas.sh + run: linPEAS/linpeas.sh -h - name: Create local changes run: git add linPEAS/linpeas.sh @@ -138,9 +140,6 @@ jobs: 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