From 0a50b5047969a4e28f7aa0e582345a2e87481e04 Mon Sep 17 00:00:00 2001 From: octt <6083316-octospacc@users.noreply.gitlab.com> Date: Sat, 25 Feb 2023 23:10:39 +0000 Subject: [PATCH] [Manual] Update CI config --- .github/workflows/main.yml | 9 ++++----- .gitlab-ci.yml | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8a3ea1e8..56552e25 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: Build and Deploy with TiddlyWiki +name: OcttKB on: push: @@ -18,11 +18,10 @@ jobs: - name: Build run: | sudo apt update - sudo apt install -y wget npm + sudo apt install -y wget npm python3 python3-pip sudo npm install -g tiddlywiki - ./Bootstrap.sh - #./Build.sh - #./DeployOld.sh + sudo pip3 install beautifulsoup4 + bash ./Bootstrap.sh - name: Deploy uses: JamesIves/github-pages-deploy-action@v4 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3b67e21..d605b05f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,15 +2,15 @@ image: alpine:latest before_script: | apk update - apk add wget npm + apk add wget npm python3 py3-pip npm install -g tiddlywiki + sudo pip3 install beautifulsoup4 pages: stage: deploy script: | ./Bootstrap.sh - #./Build.sh - #./DeployOld.sh + artifacts: paths: - public