refactor: change from pyenv to venv for more simplified package management
This commit is contained in:
parent
0151767149
commit
48e86fd364
@ -5,76 +5,19 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
|
||||||
runs-on: host
|
|
||||||
steps:
|
|
||||||
- name: Get Current directory
|
|
||||||
run: echo $(pwd)
|
|
||||||
setup_native:
|
setup_native:
|
||||||
if: contains(github.event.head_commit.message, '@native')
|
if: contains(github.event.head_commit.message, '@native')
|
||||||
runs-on: host
|
runs-on: host
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
python:
|
|
||||||
- 3.12.7
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.ref_name }}
|
ref: ${{ github.ref_name }}
|
||||||
- name: Clean up Virtual Environment by branch
|
|
||||||
run: ./setup/clean_up_virtualenvs.sh 0
|
|
||||||
|
|
||||||
- name: Create Virtual Environment
|
|
||||||
run: |
|
|
||||||
export PATH="$HOME/.pyenv/bin:$PATH"
|
|
||||||
eval "$(pyenv init --path)"
|
|
||||||
eval "$(pyenv init -)"
|
|
||||||
eval "$(pyenv virtualenv-init -)"
|
|
||||||
pyenv virtualenv ${{ matrix.python }} "${{ github.ref_name }}-$(git rev-parse --short "$GITHUB_SHA")"
|
|
||||||
|
|
||||||
|
|
||||||
- name: Activate Virtual Environment
|
|
||||||
run: |
|
|
||||||
export PATH="$HOME/.pyenv/bin:$PATH"
|
|
||||||
eval "$(pyenv init --path)"
|
|
||||||
eval "$(pyenv init -)"
|
|
||||||
eval "$(pyenv virtualenv-init -)"
|
|
||||||
pyenv activate "${{ github.ref_name }}-$(git rev-parse --short "$GITHUB_SHA")"
|
|
||||||
python --version # Confirm Python version
|
|
||||||
|
|
||||||
- name: Install dotenv
|
|
||||||
run: |
|
|
||||||
export PATH="$HOME/.pyenv/bin:$PATH"
|
|
||||||
eval "$(pyenv init --path)"
|
|
||||||
eval "$(pyenv init -)"
|
|
||||||
eval "$(pyenv virtualenv-init -)"
|
|
||||||
pyenv activate "${{ github.ref_name }}-$(git rev-parse --short "$GITHUB_SHA")"
|
|
||||||
pip install python-dotenv
|
|
||||||
|
|
||||||
- name: Setup
|
- name: Setup
|
||||||
run: |
|
run: make install
|
||||||
export PATH="$HOME/.pyenv/bin:$PATH"
|
|
||||||
eval "$(pyenv init --path)"
|
|
||||||
eval "$(pyenv init -)"
|
|
||||||
eval "$(pyenv virtualenv-init -)"
|
|
||||||
pyenv activate "${{ github.ref_name }}-$(git rev-parse --short "$GITHUB_SHA")"
|
|
||||||
make install
|
|
||||||
|
|
||||||
- name: Generate Config
|
- name: Generate Config
|
||||||
run: |
|
run: make gen_config
|
||||||
export PATH="$HOME/.pyenv/bin:$PATH"
|
|
||||||
eval "$(pyenv init --path)"
|
|
||||||
eval "$(pyenv init -)"
|
|
||||||
eval "$(pyenv virtualenv-init -)"
|
|
||||||
pyenv activate "${{ github.ref_name }}-$(git rev-parse --short "$GITHUB_SHA")"
|
|
||||||
make gen_config
|
|
||||||
|
|
||||||
- name: Run Tests
|
- name: Run Tests
|
||||||
run: |
|
run: make run_test
|
||||||
export PATH="$HOME/.pyenv/bin:$PATH"
|
|
||||||
eval "$(pyenv init --path)"
|
|
||||||
eval "$(pyenv init -)"
|
|
||||||
eval "$(pyenv virtualenv-init -)"
|
|
||||||
pyenv activate "${{ github.ref_name }}-$(git rev-parse --short "$GITHUB_SHA")"
|
|
||||||
make run_test
|
|
||||||
|
1
.github/workflows/setup_docker.yml
vendored
1
.github/workflows/setup_docker.yml
vendored
@ -9,6 +9,7 @@ on:
|
|||||||
# - main
|
# - main
|
||||||
jobs:
|
jobs:
|
||||||
setup_docker:
|
setup_docker:
|
||||||
|
if: contains(github.event.head_commit.message, '@docker')
|
||||||
runs-on: self-hosted
|
runs-on: self-hosted
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
5
Makefile
5
Makefile
@ -2,7 +2,8 @@
|
|||||||
PWD = $(shell pwd)
|
PWD = $(shell pwd)
|
||||||
UID = $(shell id -u)
|
UID = $(shell id -u)
|
||||||
GID = $(shell id -g)
|
GID = $(shell id -g)
|
||||||
PYTHON=python
|
PIP=${PWD}/venv/bin/pip
|
||||||
|
PYTHON=${PWD}/venv/bin/python
|
||||||
DOCKERCMD=docker
|
DOCKERCMD=docker
|
||||||
DOCKER_COMPOSE_CMD=docker-compose
|
DOCKER_COMPOSE_CMD=docker-compose
|
||||||
DOCKER_BUILD=$(DOCKERCMD) build
|
DOCKER_BUILD=$(DOCKERCMD) build
|
||||||
@ -22,7 +23,7 @@ VERSION := community
|
|||||||
ADDONS=${PWD}/addons,${PWD}/odoo/addons
|
ADDONS=${PWD}/addons,${PWD}/odoo/addons
|
||||||
|
|
||||||
install:
|
install:
|
||||||
pip install --no-input -r requirements.txt --break-system-packages
|
${PIP} install --no-input -r requirements.txt --break-system-packages
|
||||||
gen_config:
|
gen_config:
|
||||||
${PWD}/setup/init_config.sh --native ${ADDONS}
|
${PWD}/setup/init_config.sh --native ${ADDONS}
|
||||||
run_server:
|
run_server:
|
||||||
|
@ -6,7 +6,8 @@ set -euo pipefail
|
|||||||
DEPLOY_PATH=$(pwd)/deployment
|
DEPLOY_PATH=$(pwd)/deployment
|
||||||
SETUP_PATH=$(pwd)/setup
|
SETUP_PATH=$(pwd)/setup
|
||||||
|
|
||||||
|
PIP=$(pwd)/venv/bin/pip
|
||||||
|
PYTHON=$(pwd)/venv/bin/python
|
||||||
PG_USER=nexterp
|
PG_USER=nexterp
|
||||||
ODOO_ADDONS=./addons
|
ODOO_ADDONS=./addons
|
||||||
ODOO_CONFIG=./etc
|
ODOO_CONFIG=./etc
|
||||||
@ -185,7 +186,7 @@ Generate_Config_Docker(){
|
|||||||
if [[ ! -f "${DEPLOY_PATH}/.env" ]]; then
|
if [[ ! -f "${DEPLOY_PATH}/.env" ]]; then
|
||||||
cp "${DEPLOY_PATH}/env.template" "${DEPLOY_PATH}/.env"
|
cp "${DEPLOY_PATH}/env.template" "${DEPLOY_PATH}/.env"
|
||||||
fi
|
fi
|
||||||
python "$SETUP_PATH/gen_config_docker.py" --db_port 5432 --db_user $PG_USER --deploy_path "$DEPLOY_PATH" \
|
${PYTHON} "$SETUP_PATH/gen_config_docker.py" --db_port 5432 --db_user $PG_USER --deploy_path "$DEPLOY_PATH" \
|
||||||
--image "${ODOO_IMAGE}" --container "${ODOO_CONTAINER}" --tag "${ODOO_TAG:=latest}" \
|
--image "${ODOO_IMAGE}" --container "${ODOO_CONTAINER}" --tag "${ODOO_TAG:=latest}" \
|
||||||
--addons "${ODOO_ADDONS}" --config "${ODOO_CONFIG}" --backup "${VERSION}"
|
--addons "${ODOO_ADDONS}" --config "${ODOO_CONFIG}" --backup "${VERSION}"
|
||||||
Show 0 " Generate Config Complete"
|
Show 0 " Generate Config Complete"
|
||||||
@ -210,7 +211,7 @@ else
|
|||||||
Show 2 "User $USER already exists, updating password to $PASSWORD"
|
Show 2 "User $USER already exists, updating password to $PASSWORD"
|
||||||
sudo -u postgres psql -c "ALTER USER $USER WITH PASSWORD '$PASSWORD';"
|
sudo -u postgres psql -c "ALTER USER $USER WITH PASSWORD '$PASSWORD';"
|
||||||
fi
|
fi
|
||||||
python "$SETUP_PATH/gen_config.py" --db_user $USER --db_pass $PASSWORD --deploy_path "$(pwd)" \
|
${PYTHON} "$SETUP_PATH/gen_config.py" --db_user $USER --db_pass $PASSWORD --deploy_path "$(pwd)" \
|
||||||
--addons_path $ADDONS --db_port $DB_PORT
|
--addons_path $ADDONS --db_port $DB_PORT
|
||||||
Show 0 " Generate Config Complete"
|
Show 0 " Generate Config Complete"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user