diff --git a/.github/workflows/Scans.yaml b/.github/workflows/Scans.yaml deleted file mode 100644 index 5f8c8ed6..00000000 --- a/.github/workflows/Scans.yaml +++ /dev/null @@ -1,48 +0,0 @@ -name: Scan - -on: - push: - branches: 'edi-foundation-integration' - -env: - HSDP_DOCKER_HOST: docker.na1.hsdp.io - -jobs: - Init: - runs-on: ubuntu-20.04 - container: - image: docker.na1.hsdp.io/edi/build-env:master-45 - credentials: - username: ${{ secrets.HSDP_DOCKER_USER }} - password: ${{ secrets.HSDP_DOCKER_PASSWORD }} - outputs: - branchName: ${{ steps.branch.outputs.branch_name }} - ciFullImageName: "${{ env.HSDP_DOCKER_HOST }}/edi/edi-foundation-oauth2-proxy:${{ steps.branch.outputs.branch_name }}-${{ github.run_number }}" - rcFullImageName: "${{ env.HSDP_DOCKER_HOST }}/edi/edi-foundation-oauth2-proxy:${{ steps.branch.outputs.branch_name }}-${{ github.run_number }}-rc" - - steps: - - uses: actions/checkout@v2 - - - name: Extract branch name - uses: vazco/github-actions-branch-name@v1 - id: branch - - Blackduck: - needs: [Init] - runs-on: builder_blr - steps: - - name: checkout - uses: actions/checkout@v2 - - - name: blackduck scan - run: powershell -ExecutionPolicy RemoteSigned -NoExit -File ${{ github.workspace }}\Build\PS\Invoke-BlackduckDetect.ps1 -SourcePath ${{ github.workspace }} - - Fortify: - needs: [Init] - runs-on: builder_blr - steps: - - name: checkout - uses: actions/checkout@v2 - - - name: Fortify scan - run: powershell -ExecutionPolicy RemoteSigned -NoExit -File ${{ github.workspace }}\build\ps\Invoke-FortifyScan.ps1 \ No newline at end of file diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e2db5c45..4011516f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,7 +13,14 @@ on: workflow_dispatch: jobs: + Wokflow-Queue: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: ahmadnassri/action-workflow-queue@v1 + Init: + needs: [Wokflow-Queue] runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2