Skip to content

Commit

Permalink
Merge pull request #724 from crowdbotics/develop
Browse files Browse the repository at this point in the history
Merge develop into qa
  • Loading branch information
Cody Redmond authored Feb 29, 2024
2 parents d28ad90 + ef06ca3 commit 599675e
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 42 deletions.
24 changes: 22 additions & 2 deletions .github/workflows/create-github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,20 @@ jobs:
runs-on: ubuntu-latest
env:
working-directory: ./django-scaffold

environment: production
steps:
- name: Repo Clone
- name: Repo Clone
id: repo-clone
run: |
git clone https://${{ secrets.GIT_TOKEN }}@github.com/crowdbotics/django-scaffold.git
- name: Clone Reusable Actions Repo
id: reusable-actions-clone
run: |
git clone -b master https://${{ secrets.GIT_TOKEN }}@github.com/crowdbotics/github-actions.git
- name: Checkout branch
id: checkout
working-directory: ${{ env.working-directory }}
run: |
if [ ${{ github.event.client_payload.release_branch }} == "master" ]; then
Expand All @@ -36,8 +39,25 @@ jobs:
- name: Run Release Workflow
uses: ./github-actions/create-github-release
id: release
with:
working-directory: ${{ env.working-directory }}
GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
JIRA_TOKEN: ${{ secrets.JIRA_TOKEN }}
release_branch: ${{ github.event.client_payload.release_branch }}

- name: Update DJANGO_SCAFFOLD_REPO_BRANCH Environment Variable
id: update-env-var
uses: ./github-actions/publish-release-sha
with:
heroku_api_key: ${{ secrets.HEROKU_API_TOKEN }}
heroku_app_name: 'crowdbotics-slack'
git_sha: ${{ steps.release.outputs.tag_version }}
env_var_name: 'DJANGO_SCAFFOLD_REPO_BRANCH'

- uses: act10ns/slack@v2
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
with:
status: ${{ job.status }}
steps: ${{ toJson(steps) }}
6 changes: 3 additions & 3 deletions {{cookiecutter.project_slug}}/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ name = "pypi"
python_version = "3.8"

[packages]
cryptography = "~=41.0.4"
django = "==3.2.23"
cryptography = "~=42.0.4"
django = "==3.2.24"
"boto3" = "~=1.28.78"
django-environ = "~=0.11.2"
django-storages = "~=1.14"
Expand All @@ -32,4 +32,4 @@ google-cloud-storage = "==2.9.0"
pipenv = "*"
django-import-export = "*"
drf-spectacular = "~=0.26.4"
dj-rest-auth = "==5.0.1"
dj-rest-auth = "==5.0.2"
83 changes: 46 additions & 37 deletions {{cookiecutter.project_slug}}/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 599675e

Please sign in to comment.