mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-06 20:45:30 +00:00
* Port to Django 5.2 * Pin pluggy to 1.2.0 Any newer and the mystery importlib metadata error appears. Weird! >_> * Update for premailer changed default * Update view logic for is_ajax being changed to a template context processor * Port a few more tests to pytest proper Having two distinct test flavours is giving me a headache * Version 1 dockerfile Makes a VERY big image, I suspect we can optimise this a lot... * Optimise dockerfile a little lot a bit * fix(users): change logout link to POST request * fix(tests): fix some syntax errors in test code still got lots of failed tests :( * fix: replace deprecated Django APIs * ci: update Dockerfile * ci: update Dockerfile * fix(dependencies+tests): update EoL/vulnerable dependencies and improve test stability * Upgrade Python from 3.10 to 3.12 * Update frontend dependencies, replace node-sass with sass * chore(logging): ignore dangling obj reference warning from pypdf * ci: update compose.yml for prod deployment - Add Nginx as a reverse proxy - Add cert-selfsign.sh for generating self-signed certificates - Add certbot-issue.sh for Let's Encrypt certificate issuance and renewal - Add cron-install.sh and cron-uninstall.sh for system cron management - Add .env.example as an environment variable template * style: reformat code * ci: add more sleep trying to pass tests * ci: ignore browser-based tests during ci testing * fix: create home for the new user during Dockerfile building * chore: remove heroku conf file * fix: RIGS not franken anymore * fix: restore is_ajax as a boolean and split out the context processor * test: remove Selenium interaction tests and their CI workarounds * fix: harden production settings (CSRF origins, env casts, ADMINS) and drop dead debug toolbar code * deploy: serve static files from nginx, pin PGDATA, and make cert scripts loud on failure * build: switch .dockerignore to an allowlist * build: drop unused dependencies, soft-pin the rest and target Python 3.14 * build: move image to Python 3.14 / Node 24 and force DEBUG off * ci: add dependabot config for uv, npm, docker and actions * build: narrow Sass deprecation silencing to @import and require Node 24 * build: provide placeholder env for collectstatic now that DEBUG is off in the image * deploy: add plain-HTTP nginx config for local development and use it in compose * deploy: remove self-signed cert script * build: make the image multi-arch with official node and python base images * ci: lint and test on PRs, build the image on PRs and push it to GHCR on master * docs: add local running and sample data instructions * fix: report a form error instead of crashing when big power has no Power MIC * fix: upgrade pypdf and urllib3 to patched releases * fix: apply non-breaking npm audit fixes * fix: strip whitespace in ALLOWED_HOSTS and drop misleading HSTS preload * deploy: add a pyrigs healthcheck and make nginx wait for it * build: pin the uv image version * fix: correct the check-in person picker condition and use BeautifulSoup's string argument * refactor: replace unique_together with UniqueConstraint * build: replace pycodestyle with ruff and fix what it found Removes unused imports and variables, and fixes a few real problems it surfaced: - EventCheckIn.active() referenced an undefined name and raised NameError; it now returns whether the check-in has no end time - RIGS.admin defined EventChecklistAdmin twice; the second is now PowerTestRecordAdmin - RIGS/tests/conftest.py used date/timedelta without importing them - the signal-registering imports in apps.py are kept with noqa pycodestyle config in setup.cfg is dropped. * style: format the codebase with ruff * style: normalise line endings, trailing whitespace and end-of-file newlines * ci: run ruff and file hygiene through prek, and document it --------- Co-authored-by: Hang <me@hangxu.me> Co-authored-by: Joe Banks <joe@jb3.dev>
152 lines
6.1 KiB
YAML
152 lines
6.1 KiB
YAML
name: 'Combine PRs'
|
||
|
||
# Controls when the action will run - in this case triggered manually
|
||
on:
|
||
workflow_dispatch:
|
||
inputs:
|
||
branchPrefix:
|
||
description: 'Branch prefix to find combinable PRs based on'
|
||
required: true
|
||
default: 'dependabot'
|
||
mustBeGreen:
|
||
description: 'Only combine PRs that are green (status is success)'
|
||
required: true
|
||
default: true
|
||
combineBranchName:
|
||
description: 'Name of the branch to combine PRs into'
|
||
required: true
|
||
default: 'combine-prs-branch'
|
||
ignoreLabel:
|
||
description: 'Exclude PRs with this label'
|
||
required: true
|
||
default: 'nocombine'
|
||
|
||
# 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 "combine-prs"
|
||
combine-prs:
|
||
# 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:
|
||
- uses: actions/github-script@v6
|
||
id: create-combined-pr
|
||
name: Create Combined PR
|
||
with:
|
||
github-token: ${{secrets.GITHUB_TOKEN}}
|
||
script: |
|
||
const pulls = await github.paginate('GET /repos/:owner/:repo/pulls', {
|
||
owner: context.repo.owner,
|
||
repo: context.repo.repo
|
||
});
|
||
let branchesAndPRStrings = [];
|
||
let baseBranch = null;
|
||
let baseBranchSHA = null;
|
||
for (const pull of pulls) {
|
||
const branch = pull['head']['ref'];
|
||
console.log('Pull for branch: ' + branch);
|
||
if (branch.startsWith('${{ github.event.inputs.branchPrefix }}')) {
|
||
console.log('Branch matched prefix: ' + branch);
|
||
let statusOK = true;
|
||
if(${{ github.event.inputs.mustBeGreen }}) {
|
||
console.log('Checking green status: ' + branch);
|
||
const stateQuery = `query($owner: String!, $repo: String!, $pull_number: Int!) {
|
||
repository(owner: $owner, name: $repo) {
|
||
pullRequest(number:$pull_number) {
|
||
commits(last: 1) {
|
||
nodes {
|
||
commit {
|
||
statusCheckRollup {
|
||
state
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}`
|
||
const vars = {
|
||
owner: context.repo.owner,
|
||
repo: context.repo.repo,
|
||
pull_number: pull['number']
|
||
};
|
||
const result = await github.graphql(stateQuery, vars);
|
||
const [{ commit }] = result.repository.pullRequest.commits.nodes;
|
||
const state = commit.statusCheckRollup.state
|
||
console.log('Validating status: ' + state);
|
||
if(state != 'SUCCESS') {
|
||
console.log('Discarding ' + branch + ' with status ' + state);
|
||
statusOK = false;
|
||
}
|
||
}
|
||
console.log('Checking labels: ' + branch);
|
||
const labels = pull['labels'];
|
||
for(const label of labels) {
|
||
const labelName = label['name'];
|
||
console.log('Checking label: ' + labelName);
|
||
if(labelName == '${{ github.event.inputs.ignoreLabel }}') {
|
||
console.log('Discarding ' + branch + ' with label ' + labelName);
|
||
statusOK = false;
|
||
}
|
||
}
|
||
if (statusOK) {
|
||
console.log('Adding branch to array: ' + branch);
|
||
const prString = '#' + pull['number'] + ' ' + pull['title'];
|
||
branchesAndPRStrings.push({ branch, prString });
|
||
baseBranch = pull['base']['ref'];
|
||
baseBranchSHA = pull['base']['sha'];
|
||
}
|
||
}
|
||
}
|
||
if (branchesAndPRStrings.length == 0) {
|
||
core.setFailed('No PRs/branches matched criteria');
|
||
return;
|
||
}
|
||
try {
|
||
await github.rest.git.createRef({
|
||
owner: context.repo.owner,
|
||
repo: context.repo.repo,
|
||
ref: 'refs/heads/' + '${{ github.event.inputs.combineBranchName }}',
|
||
sha: baseBranchSHA
|
||
});
|
||
} catch (error) {
|
||
console.log(error);
|
||
core.setFailed('Failed to create combined branch - maybe a branch by that name already exists?');
|
||
return;
|
||
}
|
||
|
||
let combinedPRs = [];
|
||
let mergeFailedPRs = [];
|
||
for(const { branch, prString } of branchesAndPRStrings) {
|
||
try {
|
||
await github.rest.repos.merge({
|
||
owner: context.repo.owner,
|
||
repo: context.repo.repo,
|
||
base: '${{ github.event.inputs.combineBranchName }}',
|
||
head: branch,
|
||
});
|
||
console.log('Merged branch ' + branch);
|
||
combinedPRs.push(prString);
|
||
} catch (error) {
|
||
console.log('Failed to merge branch ' + branch);
|
||
mergeFailedPRs.push(prString);
|
||
}
|
||
}
|
||
|
||
console.log('Creating combined PR');
|
||
const combinedPRsString = combinedPRs.join('\n');
|
||
let body = '✅ This PR was created by the Combine PRs action by combining the following PRs:\n' + combinedPRsString;
|
||
if(mergeFailedPRs.length > 0) {
|
||
const mergeFailedPRsString = mergeFailedPRs.join('\n');
|
||
body += '\n\n⚠️ The following PRs were left out due to merge conflicts:\n' + mergeFailedPRsString
|
||
}
|
||
await github.rest.pulls.create({
|
||
owner: context.repo.owner,
|
||
repo: context.repo.repo,
|
||
title: 'Combined PR',
|
||
head: '${{ github.event.inputs.combineBranchName }}',
|
||
base: baseBranch,
|
||
body: body
|
||
});
|