Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ jobs:
with:
fetch-depth: 0

- name: Checkout required submodules
run: |
git submodule update --init --depth 1 scripts/build-tools
git submodule update --init --depth 1 scripts/changes

- name: Install the tool dependencies
uses: jdx/mise-action@v4
env:
Expand Down Expand Up @@ -214,11 +209,6 @@ jobs:
token: ${{ secrets.ACCESS_TOKEN }}
fetch-depth: 0

- name: Checkout required submodules
run: |
git submodule update --init --depth 1 scripts/build-tools
git submodule update --init --depth 1 scripts/changes

- name: Install the tool dependencies
uses: jdx/mise-action@v4
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
/build
/docs/build
/docs/content/releases
/scripts/Pipfile.lock
8 changes: 0 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
[submodule "dependencies/Tilt"]
path = dependencies/Tilt
url = https://github.com/tomsci/tomscis-lua-templater.git
[submodule "scripts/changes"]
path = scripts/changes
url = https://github.com/jbmorley/changes.git
branch = main
[submodule "scripts/build-tools"]
path = scripts/build-tools
url = https://github.com/jbmorley/build-tools.git
branch = main
[submodule "dependencies/diligence"]
path = dependencies/diligence
url = https://github.com/inseven/diligence.git
Expand Down
14 changes: 14 additions & 0 deletions scripts/Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[[source]]

name = "pypi"
url = "https://pypi.python.org/simple"
verify_ssl = true

[packages]

changes-semver = "==6.*"
inseven-build-tools = "==1.*"

[requires]

python_version = "3.12"
1 change: 0 additions & 1 deletion scripts/build-tools
Submodule build-tools deleted from 7a52a6
1 change: 0 additions & 1 deletion scripts/changes
Submodule changes deleted from 71f6d8
13 changes: 8 additions & 5 deletions scripts/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,20 @@ SCRIPTS_DIRECTORY="$ROOT_DIRECTORY/scripts"

export LOCAL_TOOLS_PATH="$ROOT_DIRECTORY/.local"

# Keep Python user installs local to the project instead of polluting the host.
export PYTHONUSERBASE="$LOCAL_TOOLS_PATH/python"
mkdir -p "$PYTHONUSERBASE"
export PATH="$PYTHONUSERBASE/bin":$PATH
export PYTHONPATH=$PYTHONUSERBASE

export PIPENV_VENV_IN_PROJECT=1
# Keep pipenv virtualenvs local and predictable.
export WORKON_HOME="$LOCAL_TOOLS_PATH"
export PIPENV_CUSTOM_VENV_NAME="venv"
export PIPENV_VENV_IN_PROJECT=0
export PIPENV_IGNORE_VIRTUALENVS=1
export PIPENV_PIPFILE="$SCRIPTS_DIRECTORY/Pipfile"

export PATH=$PATH:"$SCRIPTS_DIRECTORY/changes"
export PATH=$PATH:"$SCRIPTS_DIRECTORY/build-tools"
export PATH=$PATH:"$ROOT_DIRECTORY/dependencies/diligence/scripts"
# Add the tools to the path.
export PATH="$LOCAL_TOOLS_PATH/venv/bin":$PATH

# TODO: Remove workaround to source mise in environment.sh #421
# https://github.com/inseven/incontext/issues/421
Expand Down
9 changes: 3 additions & 6 deletions scripts/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ ROOT_DIRECTORY="$( cd "$( dirname "$( dirname "${BASH_SOURCE[0]}" )" )" &> /dev/
SCRIPTS_DIRECTORY="$ROOT_DIRECTORY/scripts"

LOCAL_TOOLS_PATH="$ROOT_DIRECTORY/.local"
CHANGES_DIRECTORY="$SCRIPTS_DIRECTORY/changes"
BUILD_TOOLS_DIRECTORY="$SCRIPTS_DIRECTORY/build-tools"

# Install tools defined in `.tool-versions`.
cd "$ROOT_DIRECTORY"
Expand All @@ -45,7 +43,6 @@ mkdir -p "$LOCAL_TOOLS_PATH"
# Source `environment.sh` to ensure the remainder of our paths are set up correctly.
source "$SCRIPTS_DIRECTORY/environment.sh"

# Install the Python dependencies.
pip install --upgrade pip pipenv wheel certifi
PIPENV_PIPFILE="$CHANGES_DIRECTORY/Pipfile" pipenv install
PIPENV_PIPFILE="$BUILD_TOOLS_DIRECTORY/Pipfile" pipenv install
# Install the Python dependencies (uses PIPENV_PIPFILE from environment.sh).
pip install --user --ignore-installed --upgrade pip pipenv wheel certifi
pipenv install