From 0bf37f8c53551a90ec6616683aeb7dc4280070c3 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Mon, 25 Sep 2023 14:32:29 +0000 Subject: [PATCH] ci(global): update CI image tags to use latest commit builds Signed-off-by: Andrei Jiroh Halili --- .gitlab-ci.yml | 2 +- .gitpod.yml | 2 +- bin/build.sh | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6005035..4330183 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ # The Docker image that will be used to build your app image: - name: quay.io/ajhalili2006/mkdocs-material-build-ci:nightly + name: quay.io/ajhalili2006/mkdocs-material-build-ci:commit-b9683f870d90ffe1a6c2d4d22c69fb8e99322e17 stages: - build diff --git a/.gitpod.yml b/.gitpod.yml index a4f038d..21a936d 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -6,7 +6,7 @@ checkoutLocation: tildeweb-ajhalili2006 -image: ghcr.io/ajhalili2006/ajhalili2006.github.io/devenv:commit-8e8a1e4d9dea4af2ffcbe874f44617b7b425788d +image: ghcr.io/ajhalili2006/ajhalili2006.github.io/devenv:commit-b9683f870d90ffe1a6c2d4d22c69fb8e99322e17 tasks: - init: | diff --git a/bin/build.sh b/bin/build.sh index 56b4756..31d864a 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -7,9 +7,8 @@ FF_ENABLE_COMMIT_DATA=${FF_ENABLE_COMMIT_DATA:-"true"} FF_GENERATE_SOCIAL_CARDS=${FF_GENERATE_SOCIAL_CARDS:-"true"} if [[ ! -d "$PWD/.venv" && $SKIP_VENV_SETUP == "" ]]; then - python3 -m venv $PWD/.venv - $PWD/.venv/bin/pip3 install -r requirements.txt --upgrade - $PWD/.venv/bin/mkdocs build -d "$TARGET_DIR" + pipenv install -r requirements.txt + pipenv run -- mkdocs build -d "$TARGET_DIR" else pip3 install -r requirements.txt --upgrade mkdocs build -d "$TARGET_DIR"