From 2a822ce9f80197e919889e45a9c3a3406d1226d6 Mon Sep 17 00:00:00 2001 From: Yash Date: Mon, 23 Sep 2024 13:38:09 +1000 Subject: [PATCH] Added branch ref to Dependabot (#949) * added branch ref * fix grouping again * change compile method * fixed compile python version --- .github/dependabot.yml | 7 +++---- .github/workflows/compile_requirements.yaml | 12 +++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 948f0d8c..755a222f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,7 @@ version: 2 updates: + - target-branch: "dev" - package-ecosystem: "pip" directory: "/" schedule: @@ -13,15 +14,13 @@ updates: groups: minor-and-patch: patterns: - - "requirements.in" - - "requirements-dev.in" + - "*" update-types: - "minor" - "patch" major: patterns: - - "requirements.in" - - "requirements-dev.in" + - "*" update-types: - "major" diff --git a/.github/workflows/compile_requirements.yaml b/.github/workflows/compile_requirements.yaml index 3c377b8a..ff6c58f2 100644 --- a/.github/workflows/compile_requirements.yaml +++ b/.github/workflows/compile_requirements.yaml @@ -1,4 +1,4 @@ -name: Compile Requirements with Docker +name: Compile Requirements on: pull_request: @@ -14,20 +14,22 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} # Checkout the branch from the pull request - name: Run pip-compile in Docker run: | docker run --platform linux/amd64 \ -v ${{ github.workspace }}:/opt/metamist \ --workdir /opt/metamist \ - --rm python:3.10-slim bash -c " \ + --rm python:3.11-slim bash -c " \ pip install pip-tools && \ echo 'Installed pip-tools!'; \ echo 'Compiling from requirements.in'; \ - pip-compile requirements.in > requirements.txt && \ + pip-compile requirements.in && \ echo 'Compiling from requirements-dev.in'; \ - pip-compile --output-file=requirements-dev.txt requirements-dev.in requirements.in" + pip-compile requirements-dev.in" - name: Commit updated requirements files run: |