diff --git a/.circleci/config.yml b/.circleci/config.yml index b78d3d58e..ab3f33ad4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,6 @@ # DOCKERHUB_REPO - docker hub repo, format: / # DOCKER_USER # DOCKER_PASS -# version: 2.1 @@ -157,32 +156,6 @@ jobs: - store_artifacts: path: docs/_build/html - docs-publish: - docker: - - image: node:10 - auth: - username: $DOCKER_USER - password: $DOCKER_PASS - steps: - - checkout - - attach_workspace: - at: docs/_build - - run: - name: Install and configure dependencies - command: | - yarn install --frozen-lockfile - git config user.email "ci-build@normandy.mozilla.org" - git config user.name "ci-build" - - run: - name: Disable jekyll builds - command: touch docs/_build/html/.nojekyll - - add_ssh_keys: - fingerprints: - - "5d:91:56:44:f2:f7:57:2a:29:88:f0:2e:37:fe:86:2a" - - run: - name: Deploy docs to gh-pages - command: yarn gh-pages --dotfiles --message "[skip ci] Docs updates" --dist docs/_build/html - python-tests: docker: - image: cimg/python:3.9.12-node @@ -217,7 +190,7 @@ jobs: name: Python tests command: | mkdir test-reports - py.test normandy \ + pytest normandy \ --tb=short -vvv \ --junitxml=test-reports/junit.xml - store_test_results: @@ -267,12 +240,6 @@ workflows: # Group: Publish # All of these should only run on master and tags - - docs-publish: - requires: - - docs-build - filters: - branches: - only: master - docker-image-publish: requires: - python-tests diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml new file mode 100644 index 000000000..cabd53371 --- /dev/null +++ b/.github/workflows/docs.yml @@ -0,0 +1,52 @@ +name: Publish Docs + +on: + workflow_dispatch: # allow manual runs + push: + branches: + - master + +permissions: + contents: read + pages: write + id-token: write + +concurrency: + group: github-pages + cancel-in-progress: false # skip any intermediate builds but let finish + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: 3.9 + - id: pages + uses: actions/configure-pages@v5 + - name: Install requirements + run: | + python -m venv .venv + source .venv/bin/activate + pipx install poetry + poetry config virtualenvs.create false + poetry install --extras docs --no-interaction --verbose --no-ansi + echo "$VIRTUAL_ENV/bin" >> $GITHUB_PATH + echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV + - name: Make docs + run: | + cd docs + make html + - uses: actions/upload-pages-artifact@v3 + with: + path: docs/_build/html + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: build + steps: + - id: deployment + uses: actions/deploy-pages@v4 diff --git a/docs/conf.py b/docs/conf.py index 0ba9eacad..6061b6e44 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -41,7 +41,7 @@ # General information about the project. project = "Normandy" -copyright = "2016-2018, Mozilla Foundation" +copyright = "2016-2024, Mozilla Foundation" author = "Mozilla Foundation" # The version info for the project you're documenting, acts as replacement for @@ -49,9 +49,9 @@ # built documents. # # The short X.Y version. -version = "0.1.0" +version = "1.147" # The full version, including alpha/beta/rc tags. -release = "0.1.0" +release = "1.147.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pyproject.toml b/pyproject.toml index 798419bbe..2cbb7d301 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ line-length = 99 [tool.poetry] name = "normandy" -version = "1.133.0" +version = "1.147.0" description = "Firefox recipe server" authors = ["Your Name "] license = "MPL-2.0"