Fixed CI configuration: adapted folder structure (#539)

* Removed the 'ls' build; the folder is no longer generated

Signed-off-by: Dscano <[email protected]>

* Moved the folder from docs/v1/build to docs/v1.

Signed-off-by: Dscano <[email protected]>

* Fix gitignore

Signed-off-by: Dscano <[email protected]>

---------

Signed-off-by: Dscano <[email protected]>

Author: Dscano

.github/workflows/any-branch-uploads.yml

@@ -27,5 +27,5 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_REGION: 'us-west-2'
-        SOURCE_DIR: 'docs/v1/build'
+        SOURCE_DIR: 'docs/v1'
         DEST_DIR: ci/${{ github.ref_name }} # only runs for push events

.github/workflows/main-branch-uploads.yml

@@ -29,14 +29,15 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_REGION: 'us-west-2'
-        SOURCE_DIR: 'docs/v1/build'
+        SOURCE_DIR: 'docs/v1'
         DEST_DIR: docs/main
     - name: Prepare spec for upload to gh-pages
       run: |
         git checkout gh-pages
         mkdir -p spec
         rm -rf spec/main
-        cp -r docs/v1/build spec/main
+        cp docs/v1/P4Runtime-Spec.html spec/main
+        cp docs/v1/P4Runtime-Spec.pdf spec/main
     - name: Upload spec to gh-pages
       uses: EndBug/add-and-commit@v9
       with:

.github/workflows/tag-uploads.yml

@@ -31,14 +31,15 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_REGION: 'us-west-2'
-        SOURCE_DIR: 'docs/v1/build'
+        SOURCE_DIR: 'docs/v1/'
         DEST_DIR: docs/${{ github.ref_name }}
     - name: Prepare spec for upload to gh-pages
       run: |
         git checkout gh-pages
         mkdir -p spec
         rm -rf spec/$TAG
-        cp -r docs/v1/build spec/$TAG
+        cp docs/v1/P4Runtime-Spec.html spec/$TAG
+        cp docs/v1/P4Runtime-Spec.pdf spec/$TAG
     - name: Upload spec to gh-pages
       uses: EndBug/add-and-commit@v9
       with:

.gitignore

@@ -1,6 +1,5 @@
 # Emacs
 *~
-docs/v1/build/
 .DS_Store
 build
 dist

docs/v1/Makefile

@@ -27,6 +27,6 @@ images:
 	soffice --convert-to png --outdir resources/figs resources/figs/*.odg > /dev/null 2>&1
 
 build_spec_with_images: images all
- 
+
 clean:
 	/bin/rm -f ${SPEC}.pdf ${SPEC}.html