Skip to content
This repository has been archived by the owner on Aug 10, 2024. It is now read-only.

Commit

Permalink
Refactor install, env, codespace targets
Browse files Browse the repository at this point in the history
  • Loading branch information
aaron-lane committed Dec 17, 2023
1 parent 5b6684e commit f3ec831
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}
},

"postStartCommand": "make codespace && make env && nohup bash -c 'make celery &'",
"postStartCommand": "make codespace",

// Configure tool-specific properties.
"customizations": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
python-version: "3.9"
- name: Install dependencies
run: |
make post-install
make install
- name: Lint with autopep8
run: |
make lint-check
Expand Down
10 changes: 3 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,13 @@ heroku:

.PHONY: install
install:
sh scripts/start_db.sh
sh scripts/create_db.sh
python3 -m venv venv
make post-install

.PHONY: post-install
post-install:
pip install -U pip
pip install -r requirements.txt
pip install -r requirements-dev.txt
make migrate
make groups
make static
make stopenv

.PHONY: static
static:
Expand All @@ -44,6 +37,7 @@ server:
.PHONY: env
env:
sh scripts/start_db.sh
sh scripts/create_db.sh
ifeq ($(USER),vscode)
sudo rabbitmq-server -detached
else
Expand Down Expand Up @@ -85,7 +79,9 @@ codespace:
sudo cp ./rabbitmq-devcontainer.conf /etc/rabbitmq/rabbitmq.conf
make .env
make .git/hooks/pre-commit
make env
make install
nohup bash -c 'make celery &'

.PHONY: test
test:
Expand Down

0 comments on commit f3ec831

Please sign in to comment.