Skip to content

Commit

Permalink
ci: Fix website builds (#161)
Browse files Browse the repository at this point in the history
This change switches to use mise-en-place and `.tool-versions` for to
manage CI and local build tool dependencies. This will hopefully help
ensure consistent tools versions are used between both and reduces the
GitHub Actions specific setup steps.
  • Loading branch information
jbmorley authored Jan 17, 2025
1 parent d6b8dc0 commit 4584c0c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 27 deletions.
14 changes: 2 additions & 12 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,8 @@ jobs:
git submodule update --init --depth 1 scripts/build-tools
git submodule update --init --depth 1 scripts/changes
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.9"

- name: Install pipenv
run: |
python -m pip install --upgrade pipenv wheel
- uses: actions/setup-node@v4
with:
node-version: 18
- name: Install the tool dependencies
uses: jdx/mise-action@v2

- name: Install dependencies
run: scripts/install-dependencies.sh
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.local
.tool-versions

/_site
/build
Expand Down
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
python 3.12.1
ruby 3.1.2
15 changes: 9 additions & 6 deletions scripts/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@
# SOFTWARE.

SCRIPTS_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ROOT_DIRECTORY="${SCRIPTS_DIRECTORY}/.."
ROOT_DIRECTORY="$SCRIPTS_DIRECTORY/.."

export PYTHONUSERBASE="${ROOT_DIRECTORY}/.local/python"
export LOCAL_TOOLS_PATH="$ROOT_DIRECTORY/.local"

export PYTHONUSERBASE="$LOCAL_TOOLS_PATH/python"
mkdir -p "$PYTHONUSERBASE"
export PATH="${PYTHONUSERBASE}/bin":$PATH
export PATH="$PYTHONUSERBASE/bin":$PATH
export PYTHONPATH=$PYTHONUSERBASE

export PATH=$PATH:"${SCRIPTS_DIRECTORY}/changes"
export PATH=$PATH:"${SCRIPTS_DIRECTORY}/build-tools"
export PATH=$PATH:"${ROOT_DIRECTORY}/diligence/scripts"
export PATH=$PATH:"$SCRIPTS_DIRECTORY/changes"
export PATH=$PATH:"$SCRIPTS_DIRECTORY/build-tools"
export PATH=$PATH:"$ROOT_DIRECTORY/diligence/scripts"
15 changes: 7 additions & 8 deletions scripts/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,16 @@ set -x
set -u

SCRIPTS_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ROOT_DIRECTORY="${SCRIPTS_DIRECTORY}/.."
CHANGES_DIRECTORY="${SCRIPTS_DIRECTORY}/changes"
BUILD_TOOLS_DIRECTORY="${SCRIPTS_DIRECTORY}/build-tools"
ROOT_DIRECTORY="$SCRIPTS_DIRECTORY/.."
CHANGES_DIRECTORY="$SCRIPTS_DIRECTORY/changes"
BUILD_TOOLS_DIRECTORY="$SCRIPTS_DIRECTORY/build-tools"

ENVIRONMENT_PATH="${SCRIPTS_DIRECTORY}/environment.sh"
source "$SCRIPTS_DIRECTORY/environment.sh"

if [ -d "${ROOT_DIRECTORY}/.local" ] ; then
rm -r "${ROOT_DIRECTORY}/.local"
if [ -d "$LOCAL_TOOLS_PATH" ] ; then
rm -r "$LOCAL_TOOLS_PATH"
fi
source "${ENVIRONMENT_PATH}"

# Install the Python dependencies
python -m pip install --target "$PYTHONUSERBASE" --upgrade pipenv wheel
PIPENV_PIPFILE="$CHANGES_DIRECTORY/Pipfile" pipenv install
PIPENV_PIPFILE="$BUILD_TOOLS_DIRECTORY/Pipfile" pipenv install

0 comments on commit 4584c0c

Please sign in to comment.