From 322bc153096bc85720fafb0a6cd718955f94c3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 22 Aug 2023 09:39:28 +0200 Subject: [PATCH] ci: drop Makefile and update Jenkinsfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- Jenkinsfile | 7 ++----- Makefile | 29 ----------------------------- 2 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 Makefile diff --git a/Jenkinsfile b/Jenkinsfile index fb6c58c43..84c4f1cf0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,16 +23,13 @@ pipeline { stages { stage('Deps') { steps { - sh 'make setup' + sh 'npm install' } } stage('Build') { steps { - /* Make hugo-obsidian available. */ - withEnv(["PATH+EXTRA=${env.HOME}/go/bin"]) { - sh 'make build' - } + sh 'npx quartz build' } } diff --git a/Makefile b/Makefile deleted file mode 100644 index 7b6e7b832..000000000 --- a/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -.DEFAULT_GOAL := serve - -help: ## Show all Makefile targets - @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' - -setup: install-hugo-obsidian - -install-hugo-obsidian: - go install github.com/jackyzha0/hugo-obsidian@latest - -update: install-hugo-obsidian ## Update Quartz to the latest version on Github - @git remote show upstream || (echo "remote 'upstream' not present, setting 'upstream'" && git remote add upstream https://github.com/jackyzha0/quartz.git) - git fetch upstream - git log --oneline --decorate --graph ..upstream/hugo - git checkout -p upstream/hugo -- layouts .github assets/js assets/styles/base.scss assets/styles/darkmode.scss config.toml data - -update-force: install-hugo-obsidian ## Forcefully pull all changes and don't ask to patch - @git remote show upstream || (echo "remote 'upstream' not present, setting 'upstream'" && git remote add upstream https://github.com/jackyzha0/quartz.git) - git fetch upstream - git checkout upstream/hugo -- layouts .github assets/js assets/styles/base.scss assets/styles/darkmode.scss config.toml data - -obsidian: - hugo-obsidian -input=content -output=assets/indices -index -root=. - -build: obsidian - hugo --enableGitInfo - -serve: obsidian ## Serve Quartz locally - hugo server --enableGitInfo