Skip to content

Commit

Permalink
Merge pull request #348 from sparcs-kaist/hotfix/board-enum
Browse files Browse the repository at this point in the history
Restore auto() in Enum to fixed integers
  • Loading branch information
injoonH authored Oct 14, 2022
2 parents a8dcb82 + fb7f0ff commit bc1aa19
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 43 deletions.
72 changes: 36 additions & 36 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Run tests for new-ara-api
on:
on:
workflow_dispatch:
push:
branches:
Expand All @@ -18,45 +18,45 @@ env:
SSO_SECRET_KEY: ${{ secrets.SSO_SECRET_KEY }}
PORTAL_2FA_KEY: ${{ secrets.PORTAL_2FA_KEY }}
AWS_REGION: ap-northeast-2

jobs:
deploy:
name: Run Tests
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{env.AWS_REGION}}
- name: Checkout
uses: actions/checkout@v2

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{env.AWS_REGION}}

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1

- name: Install
run: |
chmod +x .github/workflows/generate-docker-tag.sh
. .github/workflows/generate-docker-tag.sh
echo "PUSH=$PUSH" >> $GITHUB_ENV
echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
echo "CACHE_DOCKER_TAG=$CACHE_DOCKER_TAG" >> $GITHUB_ENV
docker pull $ECR/$PROJECT_NAME:$CACHE_DOCKER_TAG || true
- name: Build
run: |
docker build --build-arg AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID --build-arg AWS_SECRET_ACCESS_KEY=$(echo $AWS_SECRET_ACCESS_KEY) --cache-from $ECR/$PROJECT_NAME:$CACHE_DOCKER_TAG -t $PROJECT_NAME .
- name: Install
run: |
chmod +x .github/workflows/generate-docker-tag.sh
. .github/workflows/generate-docker-tag.sh
echo "PUSH=$PUSH" >> $GITHUB_ENV
echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
echo "CACHE_DOCKER_TAG=$CACHE_DOCKER_TAG" >> $GITHUB_ENV
docker pull $ECR/$PROJECT_NAME:$CACHE_DOCKER_TAG || true
- name: Build
run: |
docker build --build-arg AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID --build-arg AWS_SECRET_ACCESS_KEY=$(echo $AWS_SECRET_ACCESS_KEY) --cache-from $ECR/$PROJECT_NAME:$CACHE_DOCKER_TAG -t $PROJECT_NAME .
- name: Run test
run: |
docker-compose -f docker-compose.test.yml run api test
docker-compose -f docker-compose.test.yml down
- if: env.PUSH == 'true'
name: Push docker image
run: |
echo "Start docker image push"
docker tag $PROJECT_NAME $ECR/$PROJECT_NAME:$DOCKER_TAG && docker push $ECR/$PROJECT_NAME:$DOCKER_TAG
echo "Finish docker image push"
- name: Run test
run: |
docker-compose -f docker-compose.test.yml run api test
docker-compose -f docker-compose.test.yml down
- if: env.PUSH == 'true'
name: Push docker image
run: |
echo "Start docker image push"
docker tag $PROJECT_NAME $ECR/$PROJECT_NAME:$DOCKER_TAG && docker push $ECR/$PROJECT_NAME:$DOCKER_TAG
echo "Finish docker image push"
14 changes: 7 additions & 7 deletions apps/core/models/board.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from enum import IntEnum, auto
from enum import IntEnum

from django.db import models
from django_extensions.db.fields import AutoSlugField
Expand All @@ -7,15 +7,15 @@


class BoardNameType(IntEnum):
REGULAR = auto()
ANONYMOUS = auto()
REALNAME = auto()
REGULAR = 0
ANONYMOUS = 1
REALNAME = 2


class BoardAccessPermissionType(IntEnum):
READ = auto()
WRITE = auto()
COMMENT = auto()
READ = 0
WRITE = 1
COMMENT = 2


class Board(MetaDataModel):
Expand Down

0 comments on commit bc1aa19

Please sign in to comment.