Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding signed commits #330

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Adding signed commits #330

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a9e2fb
Updated bot signature and have ignored currently un-fixable vulnerabi…
SteveScorfield Jun 28, 2024
c81c063
auto patch increment
ras-rm-pr-bot Jun 28, 2024
023368c
Unpinned flask-cors version
SteveScorfield Jun 28, 2024
dc96dbb
Merge branch 'sign-pr-bot-commits' of https://github.com/ONSdigital/r…
SteveScorfield Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,28 @@ jobs:
run: |
git fetch --tags
echo "tag=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
- name: Import BOT GPG key
run: echo $BOT_GPG_KEY | base64 --decode | gpg --batch --import
env:
BOT_GPG_KEY: ${{ secrets.BOT_GPG_KEY }}
- name: Prepare gpg CLI signing step
run: |
rm -rf /tmp/gpg.sh
echo '#!/bin/bash' >> /tmp/gpg.sh
echo 'gpg --batch --pinentry-mode=loopback --passphrase $BOT_GPG_KEY_PASSPHRASE $@' >> /tmp/gpg.sh
chmod +x /tmp/gpg.sh
- name: Setup git
run: |
git config commit.gpgsign true
git config user.signingkey "${{ secrets.BOT_GPG_KEY_ID }}"
git config gpg.program /tmp/gpg.sh
git config user.name "${{ secrets.BOT_USERNAME }}"
git config user.email "${{ secrets.BOT_EMAIL }}"
- name: update versions
if: github.ref != 'refs/heads/main'
env:
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
BOT_GPG_KEY_PASSPHRASE: ${{ secrets.BOT_GPG_KEY_PASSPHRASE }}
COMMIT_MSG: |
auto patch increment
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build-kubernetes:
docker build -f _infra/docker/Dockerfile .

lint:
pipenv check ./application ./tests -i 51457
pipenv check ./application ./tests -i 70612 -i 70624
pipenv run isort .
pipenv run black --line-length 120 .
pipenv run flake8 ./application ./tests
Expand Down
3 changes: 2 additions & 1 deletion Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ python_version = "3.11"

[packages]
flask = "*"
flask-cors = "*"
flask-cors = "4.0.1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pinned?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has been unpinned. I was running a test and forgot to unpin after.

gunicorn = "*"
gevent = {version = "*", platform_python_implementation="=='CPython'"}
sqlalchemy = "*"
Expand All @@ -25,6 +25,7 @@ pycryptodome = "*"
requestsdefaulter = "*"
google-cloud-storage = "*"
google-cloud-pubsub = "*"
jinja2 = "*"

[dev-packages]
black = "*"
Expand Down
Loading
Loading