diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b843f1e..1a3ec3d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ image: name: quay.io/ajhalili2006/mkdocs-material-build-ci:nightly stages: + - test - build default: @@ -10,16 +11,18 @@ default: - amd64 # currently, we only the image in amd64 right now. # Functions that should be executed before the build script is run before_script: - - pipenv install + - pipenv sync --verbose - npm ci - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash + # Global builds and stuff variables: - DEBUG: "1" + DEBUG: "1" # MAY HORRIBLY LEAK SECRETS, PROCEED WITH CAUTION FF_ENABLE_COMMIT_DATA: "true" FF_GENERATE_SOCIAL_CARDS: "true" SECURE_FILES_DOWNLOAD_PATH: /run/secrets GIT_DEPTH: "0" + PIPENV_SYSTEM: "true" # do system pip management since we're inside containers pages: stage: build @@ -40,7 +43,6 @@ pages:srht: needs: - pages script: - - tar -C gmi -cvz . -f site.tar.gz - doppler run -- ./bin/deploykit-gmi.sh rules: - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH diff --git a/Pipfile b/Pipfile index 6412a4e..fabb624 100644 --- a/Pipfile +++ b/Pipfile @@ -18,3 +18,9 @@ mkdocs-autolinks-plugin = "*" [requires] python_version = "3.11" + +[scripts] +dev = "mkdocs serve --watch overrides --watch-theme --livereload" +build = "mkdocs build" +build-staging = "mkdocs build -f mkdocs.readthedocs.yml" +build-tilde = "mkdocs build -f mkdocs.tilde.yml" diff --git a/bin/deploykit-gmi.sh b/bin/deploykit-gmi.sh index 43c6f9b..2d493ff 100755 --- a/bin/deploykit-gmi.sh +++ b/bin/deploykit-gmi.sh @@ -11,7 +11,7 @@ fi mkdir "gmi/api" git rev-parse HEAD > "gmi/api/commit" -tar -C gmi -cvz . -f site.tar.gz +tar -C gmi -cvz . -f gemini-site.tar.gz curl --oauth2-bearer "$SOURCEHUT_PAGES_TOKEN" \ -Fcontent=@site.tar.gz \ @@ -20,4 +20,4 @@ curl --oauth2-bearer "$SOURCEHUT_PAGES_TOKEN" \ curl --oauth2-bearer "$SOURCEHUT_PAGES_TOKEN" \ -Fcontent=@site.tar.gz \ -Fprotocol=GEMINI \ - "https://pages.sr.ht/publish/${GEMINI_CUSTOM_DOMAIN}" \ No newline at end of file + "https://pages.sr.ht/publish/${GEMINI_CUSTOM_DOMAIN}" diff --git a/bin/setup-remotes.sh b/bin/setup-remotes.sh new file mode 100644 index 0000000..5fbe367 --- /dev/null +++ b/bin/setup-remotes.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +# URL prefixes for updating remote URLs +JETBRAINS_SPACE_REPO="git.jetbrains.space/ajhalili2006/web/andreijiroh.dev.git" +SOURCEHUT_GIT_REPO="git.sr.ht/~ajhalili2006/web" +GITHUB_REPO="github.com/ajhalili2006/ajhalili2006.github.io" +GITLAB_REPO="mau.dev/andreijiroh.dev/website" + +useHttps() { + +} + +useSsh() { + +} diff --git a/markdown/faq.md b/markdown/faq.md index 82058f8..531512e 100644 --- a/markdown/faq.md +++ b/markdown/faq.md @@ -1,3 +1,6 @@ # Frequently Asked Questions -Working on it soon. \ No newline at end of file +_Last updated: 2023-10-TBD_ + +!!! warning "To be worked on soon" + I'll be compiling some answers to frequently asked questions about me in the future.