diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 17a043b..8d4b2aa 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -11,7 +11,7 @@ permissions: jobs: auto-merge: runs-on: ubuntu-latest - if: ${{ (github.actor == 'dependabot[bot]' || github.actor == 'HavenDV') && github.repository_owner == 'tryAGI' }} + if: ${{ github.event.pull_request.draft == false && (github.actor == 'dependabot[bot]' || github.actor == 'HavenDV') && github.repository_owner == 'tryAGI' }} steps: - name: Dependabot metadata if: ${{ github.actor == 'dependabot[bot]' }} diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index ea4b6fa..10d9cae 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -29,6 +29,11 @@ jobs: git checkout -b ${{ steps.branch.outputs.branch_name }} origin/main git rebase main + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9.0.x + - name: Generate code run: | cd src/libs/Replicate diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/mkdocs.yml index 44b610b..064fa24 100644 --- a/.github/workflows/mkdocs.yml +++ b/.github/workflows/mkdocs.yml @@ -34,6 +34,11 @@ jobs: - name: Install dependencies run: pip install mkdocs-material + + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9.0.x - name: Generate docs run: dotnet run --project src/helpers/GenerateDocs/GenerateDocs.csproj . diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ae5a1e4..a9f41c3 100755 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -7,6 +7,7 @@ on: jobs: test: name: Test + if: github.event.pull_request.draft == false uses: HavenDV/workflows/.github/workflows/dotnet_build-test-publish.yml@main with: generate-build-number: false diff --git a/Replicate.sln b/Replicate.sln index 2794ae0..2d3c4a3 100755 --- a/Replicate.sln +++ b/Replicate.sln @@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .github\workflows\pull-request.yml = .github\workflows\pull-request.yml .github\workflows\auto-update.yml = .github\workflows\auto-update.yml .github\workflows\mkdocs.yml = .github\workflows\mkdocs.yml + .github\workflows\auto-merge.yml = .github\workflows\auto-merge.yml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{61E7E11E-4558-434C-ACE8-06316A3097B3}"