diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59b9dc5..9061585 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,20 +1,14 @@ # The Docker image that will be used to build your app image: - name: ghcr.io/andreijiroh-dev/docker-images/mkdocs-material:latest - entrypoint: ["/bin/bash", "-l", "-c"] # https://gitlab.com/gitlab-org/gitlab-runner/-/issues/2109#note_47480476 - + name: ghcr.io/cachix/devenv/devenv:latest stages: - test - build default: - tags: - - 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 --ignore-pipfile --deploy - - npm ci - - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash + - devenv shell echo "trigger install" + #- curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash # Global builds and stuff variables: @@ -32,14 +26,12 @@ variables: pages: stage: build script: - - bash ./bin/build.sh - - doppler run -- npm run deploy + - devenv shell doppler run -- npm run deploy:cf artifacts: paths: # The folder that contains the files to be exposed at the Page URL - public variables: - CF_PAGES_PROJECT_NAME: ajhalili2006 # doppler DOPPLER_TOKEN: $DOPPLER_TOKEN rules: diff --git a/.readthedocs.yaml b/.readthedocs.yaml index aa72905..072344b 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,21 +6,26 @@ version: 2 # Set the version of Python and other tools you might need build: - os: ubuntu-22.04 + os: ubuntu-24.04 tools: - python: "3.11" - #nodejs: 18 + python: "3.13" + #nodejs: 22 jobs: post_checkout: # Needed for some plugins/extensions to work - git fetch --unshallow || true + create_environment: + - pipenv install + build: + html: + - pipenv run mkdocs build -f mkdocs.redthedocs.yml -d "$READTHEDOCS_OUTPUT/html/" post_build: - | - mkdir $READTHEDOCS_OUTPUT/api - git rev-parse HEAD > $READTHEDOCS_OUTPUT/api/commit - - | - cp -rv markdown/.well-known $READTHEDOCS_OUTPUT/html/.well-known - cp $READTHEDOCS_OUTPUT/html/assets/images/favicon.png $READTHEDOCS_OUTPUT/favicon.ico + mkdir $READTHEDOCS_OUTPUT/html/api + git rev-parse HEAD > $READTHEDOCS_OUTPUT/html/api/commit + #- | + # cp -rv markdown/.well-known $READTHEDOCS_OUTPUT/html/.well-known + # cp -rv $READTHEDOCS_OUTPUT/html/assets/images/favicon.png $READTHEDOCS_OUTPUT/favicon.ico apt_packages: - libcairo2-dev - libfreetype6-dev @@ -29,12 +34,4 @@ build: - libpng-dev - libz-dev - pngquant - -mkdocs: - configuration: mkdocs.readthedocs.yml - fail_on_warning: false - -# Optionally declare the Python requirements required to build your docs -python: - install: - - requirements: requirements.txt + - pipenv diff --git a/devenv.yaml b/devenv.yaml index 77d6b94..2f12eb7 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -6,3 +6,6 @@ inputs: follows: nixpkgs nixpkgs: url: https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/*.tar.gz + +# If you're using non-OSS software, you can set allowUnfree to true. +allowUnfree: true