Skip to content

Commit 553980f

Browse files
committed
Merge pull request #1706 from bettio/move-documentation-to-doc-domain
Move documentation to doc.atomvm.org These changes are made under both the "Apache 2.0" and the "GNU Lesser General Public License 2.1 or later" license terms (dual license). SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
2 parents 9c1375c + 1929925 commit 553980f

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

.github/workflows/publish-docs.yaml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ jobs:
9494
- uses: actions/checkout@v4
9595
id: checkout-production
9696
with:
97-
repository: atomvm/atomvm_www
98-
ref: Production
97+
repository: atomvm/doc.atomvm.org
98+
ref: main
9999
path: /home/runner/work/AtomVM/AtomVM/www
100100

101101
- name: Track all branches
@@ -115,21 +115,20 @@ jobs:
115115
cmake ..
116116
cd doc
117117
make GitHub_CI_Publish_Docs
118-
rm -frv "/__w/AtomVM/AtomVM/www/doc/${{ github.ref_name }}"
119-
cp -av html "/__w/AtomVM/AtomVM/www/doc/${{ github.ref_name }}"
118+
rm -frv "/__w/AtomVM/AtomVM/www/${{ github.ref_name }}"
119+
cp -av html "/__w/AtomVM/AtomVM/www/${{ github.ref_name }}"
120120
- name: Commit files
121121
id: commit_files
122122
if: github.repository == 'atomvm/AtomVM'
123123
working-directory: /home/runner/work/AtomVM/AtomVM/www
124124
run: |
125125
git config --local user.email "atomvm-doc-bot@users.noreply.github.com"
126126
git config --local user.name "AtomVM Doc Bot"
127-
ls -la doc/
128-
git status "doc/${{ github.ref_name }}"
129-
git add "doc/${{ github.ref_name }}"
127+
git status "${{ github.ref_name }}"
128+
git add "${{ github.ref_name }}"
130129
git add .
131-
git diff --exit-code Production || echo "Going to commit"
132-
git diff --exit-code Production || git commit -m "Update Documentation for ${{ github.ref_name }}"
130+
git diff --exit-code main || echo "Going to commit"
131+
git diff --exit-code main || git commit -m "Update Documentation for ${{ github.ref_name }}"
133132
git log -1
134133
- name: Push changes
135134
if: github.repository == 'atomvm/AtomVM'
@@ -142,7 +141,7 @@ jobs:
142141
echo "github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl" > ~/.ssh/known_hosts
143142
echo "github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=" >> ~/.ssh/known_hosts
144143
echo "github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=" >> ~/.ssh/known_hosts
145-
git remote add push_dest "git@github.com:atomvm/atomvm_www.git"
144+
git remote add push_dest "git@github.com:atomvm/doc.atomvm.org.git"
146145
git fetch push_dest
147-
git diff --exit-code push_dest/Production || echo "Going to push"
148-
git diff --exit-code push_dest/Production || git push --set-upstream push_dest Production
146+
git diff --exit-code push_dest/main || echo "Going to push"
147+
git diff --exit-code push_dest/main || git push --set-upstream push_dest main

doc/conf.py.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,9 @@ html_css_files = [
148148

149149
html_favicon = '@CMAKE_CURRENT_SOURCE_DIR@/src/_static/favicon/favicon.ico'
150150

151-
html_baseurl = 'https://atomvm.net/doc'
151+
# html_baseurl is used for the Canonical Link Relation
152+
# See also https://datatracker.ietf.org/doc/html/rfc6596.html
153+
html_baseurl = 'https://doc.atomvm.org/release-0.6/'
152154

153155
############################
154156
# SETUP THE RTD LOWER-LEFT #
@@ -158,7 +160,7 @@ try:
158160
except NameError:
159161
html_context = dict()
160162

161-
html_baseurl = 'https://atomvm.net/doc'
163+
html_baseurl = 'https://doc.atomvm.org/release-0.6/'
162164

163165
html_context['display_lower_left'] = 'True'
164166

doc/edoc/gendoc.erl.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ main([LibraryName, SrcDir, TgtDir]) ->
3636
{doclet, edown_doclet},
3737
{source_path, ["src"]},
3838
{library, LibraryName},
39-
{LibraryName, "https://atomvm.net/doc/apidocs/erlang/" ++ LibraryName},
39+
% This is used as Canonical Link Relation
40+
% See also: https://datatracker.ietf.org/doc/html/rfc6596.html
41+
{LibraryName, "https://doc.atomvm.org/release-0.6/apidocs/erlang/" ++ LibraryName},
4042
{stylesheet, ""},
4143
{image, ""},
4244
{dir, TgtDir}

0 commit comments

Comments
 (0)