Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
Fabrizio Cafolla committed Sep 19, 2024
1 parent 2b45148 commit 7157fdb
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 118 deletions.
19 changes: 12 additions & 7 deletions .activate
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,23 @@ if [ "${BASH_SOURCE-}" = "$0" ]; then
exit 33
fi

venv_filename="${VENV_DIR:-.venv}/bin/activate"
VENV_FILE="${VENV_DIR}/bin/activate"

if [[ -f ${venv_filename} ]]; then
source "${venv_filename}"
if [ -f "${VENV_FILE}" ]; then
. "${VENV_FILE}"
else
echo "VENV_DIR: ${VENV_DIR}"
echo "VENV_FILE: ${VENV_FILE}"
echo "WARN No virtualenv found. Run 'make setup' to create one."
fi

if [[ -f .env ]]; then
source ".env"
ENV_FILE="${DEVBOX_PROJECT_ROOT}/.env"
DOPPLER_FILE="${DEVBOX_PROJECT_ROOT}/.env.doppler"

if [ -f "${ENV_FILE}" ]; then
. "${ENV_FILE}"
fi

if [[ -f .env.doppler ]]; then
source ".env.doppler"
if [ -f "${DOPPLER_FILE}" ]; then
. "${DOPPLER_FILE}"
fi
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,5 @@ jobs:
AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
AWS_ROLE_NAME: ${{ secrets.AWS_ROLE_NAME }}
run: |
devbox shell
devbox run infra setup
devbox run tests
21 changes: 13 additions & 8 deletions devbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,28 @@
"[email protected]",
"[email protected]"
],
"env": {},
"env": {
"INFRASTRUCTURE_PATH": "${DEVBOX_PROJECT_ROOT}/infrastructure",
"WEBSITE_PATH": "${DEVBOX_PROJECT_ROOT}/website"
},
"include": [],
"shell": {
"init_hook": [". $VENV_DIR/bin/activate", "devbox run setup"],
"init_hook": [". ${DEVBOX_PROJECT_ROOT}/.activate", "devbox run setup"],
"scripts": {
"infra": ["cd infrastructure && make $@ ; cd -"],
"website": ["cd website && make $@ ; cd -"],
"infra": ["cd ${INFRASTRUCTURE_PATH} && make $@ ; cd -"],
"website": ["cd ${WEBSITE_PATH} && make $@ ; cd -"],
"setup": [
"chmod +x scripts/*",
"pip3 install -r requirements.txt",
". ${DEVBOX_PROJECT_ROOT}/.activate",
"chmod +x ${DEVBOX_PROJECT_ROOT}/scripts/*",
"pip3 install -r ${DEVBOX_PROJECT_ROOT}/requirements.txt",
"pre-commit install",
"devbox run website setup"
],
"deploy": ["./scripts/deploy.sh"],
"doppler": ["./scripts/doppler.sh"],
"deploy": ["${DEVBOX_PROJECT_ROOT}/scripts/deploy.sh"],
"doppler": ["${DEVBOX_PROJECT_ROOT}/scripts/doppler.sh"],
"lint": ["pre-commit run --all-files"],
"tests": [
". ${DEVBOX_PROJECT_ROOT}/.activate",
"devbox run lint",
"devbox run website pages-check",
"devbox run website build",
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
-r website/requirements.txt
checkov==3.2.*
pre-commit==3.*
8 changes: 6 additions & 2 deletions website/src/pages/communities/italian-linux-society.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ tags: dev, talks, networking, tech, linuz
---

# Italian Linux Society
import VerifiedIcon from '@mui/icons-material/Verified'
import Alert from '@mui/material/Alert';

![GitHub Repo](https://img.shields.io/static/v1?label=category&message=communities&color=green)
# Italian Linux Society <VerifiedIcon color="primary"/>


![Community Partner](https://img.shields.io/static/v1?label=community&message=partner&color=blue) ![GitHub Repo](https://img.shields.io/static/v1?label=category&message=communities&color=green)

### Description

Expand Down
Loading

0 comments on commit 7157fdb

Please sign in to comment.