Skip to content

Commit 7594c3c

Browse files
Remove reference to docker based doc building in Makefile (#1430)
* rm reference to docker based doc building * fix * fix upload * test * fix
1 parent 3c8e4ba commit 7594c3c

File tree

3 files changed

+12
-26
lines changed

3 files changed

+12
-26
lines changed

.github/workflows/build_documentation.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,10 @@ jobs:
5656
- name: Make documentation
5757
shell: bash
5858
run: |
59-
doc-builder build optimum.intel docs/source/ \
60-
--repo_name optimum-intel \
61-
--build_dir intel-doc-build/ \
62-
--version ${{ env.VERSION }} \
63-
--version_tag_suffix "" \
64-
--html \
65-
--clean
66-
cd intel-doc-build
67-
mv optimum.intel optimum-intel
68-
doc-builder push optimum-intel --doc_build_repo_id "hf-doc-build/doc-build" --token "${{ secrets.HF_DOC_BUILD_PUSH }}" --commit_msg "Updated with commit $COMMIT_SHA See: https://github.com/huggingface/optimum-intel/commit/$COMMIT_SHA" --n_retries 5
59+
make doc BUILD_DIR=./doc-build VERSION=${{ env.VERSION }}
60+
mv ./doc-build/optimum.intel ./doc-build/optimum-intel
61+
doc-builder push ./doc-build/optimum-intel \
62+
--doc_build_repo_id "hf-doc-build/doc-build" \
63+
--commit_msg "Updated with commit $COMMIT_SHA See: https://github.com/huggingface/optimum-intel/commit/$COMMIT_SHA" \
64+
--token "${{ secrets.HF_DOC_BUILD_PUSH }}" \
65+
--n_retries 5

.github/workflows/build_pr_documentation.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,12 @@ jobs:
4343
- name: Make documentation
4444
shell: bash
4545
run: |
46-
doc-builder build optimum.intel docs/source/ \
47-
--repo_name optimum-intel \
48-
--build_dir intel-doc-build/ \
49-
--version pr_${{ env.PR_NUMBER }} \
50-
--version_tag_suffix "" \
51-
--html \
52-
--clean
53-
cd intel-doc-build
54-
mv optimum.intel optimum-intel
46+
make doc BUILD_DIR=./doc-build VERSION=pr_${{ env.PR_NUMBER }}
47+
mv ./doc-build/optimum.intel ./doc-build/optimum-intel
5548
echo ${{ env.COMMIT_SHA }} > ./commit_sha
5649
echo ${{ env.PR_NUMBER }} > ./pr_number
5750
5851
- uses: actions/upload-artifact@v4
5952
with:
6053
name: doc-build-artifact
61-
path: optimum-intel/intel-doc-build/
54+
path: ./doc-build/optimum-intel

Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,10 @@ build_dist:
4545
pypi_upload: build_dist
4646
python -m twine upload dist/*
4747

48-
build_doc_docker_image:
49-
docker build -t doc_maker --build-arg commit_sha=$(COMMIT_SHA_SUBPACKAGE) --build-arg clone_url=$(REAL_CLONE_URL) ./docs
50-
51-
doc: build_doc_docker_image
48+
doc:
5249
@test -n "$(BUILD_DIR)" || (echo "BUILD_DIR is empty." ; exit 1)
5350
@test -n "$(VERSION)" || (echo "VERSION is empty." ; exit 1)
54-
docker run -v $(CURRENT_DIR):/doc_folder --workdir=/doc_folder --env CI=$(CI) doc_maker \
55-
doc-builder build optimum.intel /optimum-intel/docs/source/ \
51+
doc-builder build optimum.intel docs/source/ \
5652
--repo_name optimum-intel \
5753
--build_dir $(BUILD_DIR) \
5854
--version $(VERSION) \

0 commit comments

Comments
 (0)