Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SatelliteQE/nailgun
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.16.0.1
Choose a base ref
...
head repository: SatelliteQE/nailgun
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ updates:
schedule:
interval: "daily"
labels:
- '6.17.z'
- '6.16.z'
- "CherryPick"
- "dependencies"
@@ -23,6 +24,7 @@ updates:
schedule:
interval: "daily"
labels:
- '6.17.z'
- '6.16.z'
- "CherryPick"
- "dependencies"
4 changes: 2 additions & 2 deletions .github/workflows/auto_branching.yml
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ jobs:
- name: Checkout from ${{ github.event.inputs.target_branch }} branch for auto-branching changes
id: checkout-to-auto-branch
run: |
branch_name="auto-branching-${{ github.event.inputs.target_branch }}-$(date '+%s')"
branch_name="auto-branching-${{ github.event.inputs.target_branch }}-$(date '+%s.%N')"
git checkout -b "$branch_name"
echo "branch_name=$branch_name" >> $GITHUB_OUTPUT
@@ -167,7 +167,7 @@ jobs:
run: |
git config --local user.email "Satellite-QE.satqe.com"
git config --local user.name "Satellite-QE"
branch_name="auto-branching-${{ github.event.inputs.target_branch }}-$(date '+%s')"
branch_name="auto-branching-${{ github.event.inputs.target_branch }}-$(date '+%s.%N')"
git checkout -b "$branch_name"
git add ./.github/*
git commit -m "Changes for ${{ github.event.inputs.target_branch }} new branch"
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yaml
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ jobs:
- id: automerge
name: Auto merge of cherry-picked PRs.
uses: pascalgn/automerge-action@v0.16.3
uses: pascalgn/automerge-action@v0.16.4
if: steps.waitforstatuschecks.outputs.status == 'success'
env:
GITHUB_TOKEN: "${{ secrets.CHERRYPICK_PAT }}"
6 changes: 3 additions & 3 deletions .github/workflows/merge_to_master.yml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12', '3.13']
steps:
- name: Checkout Nailgun
uses: actions/checkout@v4
@@ -61,10 +61,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Setup python 3.10
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.13'
- name: Install pypa/build
run: python -m pip install build --user
- name: Build a binary wheel and a source tarball
2 changes: 1 addition & 1 deletion .github/workflows/pull_requests.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12', '3.13']
steps:
- name: Checkout Nailgun
uses: actions/checkout@v4
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -5,16 +5,16 @@ ci:

repos:
- repo: https://github.com/psf/black
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.7
rev: v0.7.3
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-yaml
- id: debug-statements
Loading