Skip to content

Commit

Permalink
deploy branch with updated lti base app
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeseibel committed Nov 23, 2024
1 parent 961e925 commit d8efc01
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 15 deletions.
16 changes: 3 additions & 13 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ env:
# defined in the "deploy" job
on:
push:
branches: [main, master, qa, develop, feature/eval-me]
branches: [main, develop, task/django-blti-update]
pull_request:
branches: [main, master, qa, develop, feature/eval-me]
branches: [main, develop]
types: [opened, reopened, synchronize]

jobs:
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:

- name: Deployment Pipeline
if: >-
contains(fromJSON('["main", "master", "develop", "qa"]'),
contains(fromJSON('["main", "develop", "task/django-blti-update"]'),
needs.context.outputs.git_repo_branch)
uses: uw-it-aca/actions/cicd-deploy@main
with:
Expand All @@ -162,16 +162,6 @@ jobs:
git_repo_branch: ${{ needs.context.outputs.git_repo_branch }}
gh_auth_token: ${{ secrets.GH_AUTH_TOKEN }}

- name: Deploy Evaluation Branch
if: needs.context.outputs.git_repo_branch == 'feature/eval-me'
uses: uw-it-aca/actions/cicd-deploy@main
with:
release_name: ${{ env.RELEASE_NAME }}
commit_hash: ${{ needs.context.outputs.commit_hash }}
git_repo_branch: ${{ needs.context.outputs.git_repo_branch }}
gh_auth_token: ${{ secrets.GH_AUTH_TOKEN }}
app_instance: eval

- name: 'Surface context from executed build step'
id: context
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG DJANGO_CONTAINER_VERSION=2.0.1
ARG DJANGO_CONTAINER_VERSION=2.0.6

FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} as app-container

Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ services:
PORT: 8000
AUTH: BLTI_DEV
LTI_DEVELOP_APP: libguide
LTI_CONFIG_DIRECTORY: MOCK
restart: always
container_name: app-libguide
build:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
include_package_data=True,
install_requires = [
'Django~=4.2',
'django-blti~=2.2',
'django-blti @ git+https://github.com/uw-it-aca/django-blti.git@feature/additive-1-point-3#egg=django-blti',
'django-compressor',
'uw-memcached-clients~=1.0',
'UW-RestClients-Core~=1.4',
Expand Down

0 comments on commit d8efc01

Please sign in to comment.