diff --git a/.github/workflows/pre-linpeas-ubuntu.yml b/.github/workflows/linpeas-development.yml similarity index 78% rename from .github/workflows/pre-linpeas-ubuntu.yml rename to .github/workflows/linpeas-development.yml index 6dcd48a..8430040 100644 --- a/.github/workflows/pre-linpeas-ubuntu.yml +++ b/.github/workflows/linpeas-development.yml @@ -13,20 +13,8 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - Run_on_Macos: - # The type of runner that the job will run on - runs-on: macos-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - # Runs a single command using the runners shell - - name: Run linpeas - run: linPEAS/linpeasasdasdasd.sh - - Run_on_Ubuntu: + # This workflow contains a single job called "build" + build: # The type of runner that the job will run on runs-on: ubuntu-latest @@ -60,3 +48,9 @@ jobs: 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" #Pull request to master + github_token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/linpeas-macos.yml b/.github/workflows/linpeas-macos.yml deleted file mode 100644 index 8ae0f6f..0000000 --- a/.github/workflows/linpeas-macos.yml +++ /dev/null @@ -1,28 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: CI-linpeas-macos - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the master branch - pull_request: - branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: macos-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - # Runs a single command using the runners shell - - name: Run linpeas - run: linPEAS/linpeas.sh \ No newline at end of file diff --git a/.github/workflows/linpeas-ubuntu.yml b/.github/workflows/linpeas-master.yml similarity index 63% rename from .github/workflows/linpeas-ubuntu.yml rename to .github/workflows/linpeas-master.yml index 458e527..0f0b173 100644 --- a/.github/workflows/linpeas-ubuntu.yml +++ b/.github/workflows/linpeas-master.yml @@ -1,12 +1,13 @@ # This is a basic workflow to help you get started with Actions -name: CI-linpeas-ubuntu +name: CI-Pro # Controls when the action will run. on: # Triggers the workflow on push or pull request events but only for the master branch pull_request: - branches: [ master ] + paths: + - 'linPEAS/linpeas.sh' # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -14,10 +15,22 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" - build: + Run_on_ubuntu: # The type of runner that the job will run on runs-on: ubuntu-latest + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + # Runs a single command using the runners shell + - name: Run linpeas + run: linPEAS/linpeas.sh + + Run_on_macos: + runs-on: macos-latest + # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it