Skip to content

Commit

Permalink
Merge pull request #2815 from zimmerman-team/develop
Browse files Browse the repository at this point in the history
security update and semantic versioning
  • Loading branch information
sylvanr authored May 23, 2023
2 parents 848e0cd + 75bcf1a commit e685725
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 5 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Semantic versioning

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the "main" branch
push:
branches: ["main", "develop"]
pull_request:
branches: ["main", "develop"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
versioning:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
# Need these two configurations because this job runs on protected branches
fetch-depth: 0
persist-credentials: false
- uses: actions/setup-node@v3
with:
node-version: 14
- name: Semantic Release
uses: cycjimmy/semantic-release-action@v3
with:
semantic_version: 18
branches: |
[
"main",
{
"name": "develop",
"prerelease": true
}
]
extra_plugins: |
"@semantic-release/commit-analyzer"
"@semantic-release/release-notes-generator"
"@semantic-release/github"
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
22 changes: 22 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "iaticloud",
"private": false,
"repository": {
"type": "git",
"url": "https://github.com/zimmerman-team/IATI.cloud.git"
},
"release": {
"branches": [
"main",
{
"name": "develop",
"prerelease": true
}
],
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/github"
]
}
}
11 changes: 6 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Django installation
Django==4.1.6
Django==4.2.1
## Dependencies
asgiref==3.6.0
sqlparse==0.4.3
sqlparse==0.4.4

# PostgreSQL support
psycopg2-binary==2.9.5
Expand All @@ -12,8 +12,8 @@ python-dotenv==0.21.1

# Celery connection
celery==5.2.7
django-celery-results==2.4.0
django-celery-beat==2.4.0
django-celery-results==2.5.1
django-celery-beat==2.5.0
flower==1.2.0
## Dependencies
amqp==5.1.1
Expand All @@ -35,6 +35,7 @@ tzdata==2022.7
humanize==4.6.0
prometheus-client==0.16.0
tornado==6.2
cron-descriptor==1.4.0

# Project maintenance
flake8==6.0.0
Expand All @@ -61,7 +62,7 @@ beautifulsoup4==4.11.2
certifi==2022.12.7
charset-normalizer==3.0.1
idna==3.4
requests==2.28.2
requests==2.31.0
soupsieve==2.3.2.post1
urllib3==1.26.14

Expand Down

0 comments on commit e685725

Please sign in to comment.