Skip to content

Commit

Permalink
Merge pull request #287 from uw-it-aca/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
mikeseibel authored Apr 4, 2024
2 parents be77ad7 + 7bd07f3 commit de30d6f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:

steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

Expand All @@ -49,18 +49,18 @@ jobs:
exclude_paths: 'migrations'

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-$(echo ${{ hashFiles('Dockerfile') }} | head -c 16)
restore-keys: |
${{ runner.os }}-buildx-
- name: Build App Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
target: app-container
tags: ${{ needs.context.outputs.image_tag }}
Expand All @@ -70,7 +70,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache

- name: Build Test Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
target: app-test-container
tags: app-test-container
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
- name: 'Surface context from executed build step'
id: context
shell: bash
run: echo "::set-output name=context::$(< ${CONTEXT_FILENAME})"
run: echo "context=$(< ${CONTEXT_FILENAME})" >> $GITHUB_OUTPUT

housekeeping:
if: github.event_name == 'push'
Expand Down
6 changes: 3 additions & 3 deletions coursedashboards/views/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ def data_error(self):
"Data not available due to an error")

def term_not_found(self):
return HttpResponse(content="Term not found!", status=543)
return HttpResponse(content="Term not found", status=404)

def course_not_found(self):
return HttpResponse(content="Course not found!", status=543)
return HttpResponse(content="Course not found", status=404)

def course_offering_not_found(self):
return HttpResponse(content="Course Offering not found!", status=543)
return HttpResponse(content="Course Offering not found", status=404)


class UpStreamErrorException(APIException):
Expand Down

0 comments on commit de30d6f

Please sign in to comment.