diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 05bff0a5f4b..bc71a8144c6 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -28,8 +28,3 @@ jobs: - name: Run build run: make build - - - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 - with: - name: mattermost-api-reference - path: api/v4/html diff --git a/api/Makefile b/api/Makefile index 25f74b0b535..3ca96847102 100644 --- a/api/Makefile +++ b/api/Makefile @@ -66,7 +66,7 @@ build-v4: node_modules playbooks cd server && go run . $(V4_YAML) @node_modules/.bin/swagger-cli validate $(V4_YAML) - @node_modules/.bin/redocly -t ./v4/html/ssr_template.hbs build-docs ./v4/html/static/mattermost-openapi-v4.yaml -o ./v4/html/index.html + @cp ./v4/html/ssr_template.hbs ./v4/html/index.html @echo Complete node_modules: package.json $(wildcard package-lock.json) @@ -76,9 +76,8 @@ node_modules: package.json $(wildcard package-lock.json) touch $@ run: - @echo Starting redoc server - - @node_modules/.bin/redocly preview-docs ./v4/html/static/mattermost-openapi-v4.yaml + @echo Starting local server + python3 -m http.server 8080 --directory ./v4/html clean: @echo Cleaning diff --git a/api/README.md b/api/README.md index 4db79eb0b76..bf205be4e53 100644 --- a/api/README.md +++ b/api/README.md @@ -1,6 +1,6 @@ # Mattermost API Documentation -This repository holds the API reference available at [https://api.mattermost.com](https://api.mattermost.com). +This repository holds the API reference documentation for Mattermost available at [https://developers.mattermost.com/api-reference](https://developers.mattermost.com/api-reference). The Mattermost API reference uses the [OpenAPI standard](https://openapis.org/) and the [ReDoc document generator](https://github.com/Rebilly/ReDoc). @@ -25,4 +25,4 @@ To test locally, run `make build`, `make run` and navigate to `http://127.0.0.1: ## Deployment -Deployment is handled automatically by our Jenkins CLI machine. When a pull request is merged it will automatically be deployed to [https://api.mattermost.com](https://api.mattermost.com). +Deployment is handled automatically by our Github Actions. When a pull request is merged, it will automatically be deployed to [https://developers.mattermost.com/api-reference](https://developers.mattermost.com/api-reference). diff --git a/api/package.json b/api/package.json index 119a7267fcd..e539f0fbf27 100644 --- a/api/package.json +++ b/api/package.json @@ -1,7 +1,7 @@ { "name": "mattermost-api-reference", "version": "1.0.0", - "description": "This repository holds the API reference available at [https://api.mattermost.com](https://api.mattermost.com).", + "description": "This repository holds the API reference documentation for Mattermost available at https://developers.mattermost.com/api-reference", "main": "index.js", "dependencies": { "@redocly/cli": "^1.13.0", @@ -28,6 +28,5 @@ "license": "ISC", "bugs": { "url": "https://github.com/mattermost/mattermost/issues" - }, - "homepage": "https://api.mattermost.com/" + } } diff --git a/api/v4/html/ssr_template.hbs b/api/v4/html/ssr_template.hbs index 298d372dacc..10f0991ad75 100644 --- a/api/v4/html/ssr_template.hbs +++ b/api/v4/html/ssr_template.hbs @@ -4,27 +4,25 @@