Skip to content

Fixed CI configuration: adapted folder structure #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrispsommers merged 3 commits into from
Jan 27, 2025
Merged

Fixed CI configuration: adapted folder structure #539

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f25475
Removed the 'ls' build; the folder is no longer generated
Dscano Jan 26, 2025
efa8109
Moved the folder from docs/v1/build to docs/v1.
Dscano Jan 26, 2025
4e70358
Fix gitignore
Dscano Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/any-branch-uploads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ jobs:
run: |
make -C docs/tools/
docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc make
ls docs/v1/build
ls docs/v1/P4Runtime-Spec.pdf
ls docs/v1/P4Runtime-Spec.html
- name: Upload spec to S3 if needed
if: ${{ github.actor != 'dependabot[bot]' }}
uses: jakejarvis/s3-sync-action@v0.5.1
Expand All @@ -26,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
8 changes: 5 additions & 3 deletions .github/workflows/main-branch-uploads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ jobs:
run: |
make -C docs/tools/
docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc make
ls docs/v1/build
ls docs/v1/P4Runtime-Spec.pdf
ls docs/v1/P4Runtime-Spec.html
- name: Upload spec to S3
uses: jakejarvis/s3-sync-action@v0.5.1
with:
Expand All @@ -28,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:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/tag-uploads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ jobs:
run: |
make -C docs/tools/
docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc make
ls docs/v1/build
ls docs/v1/P4Runtime-Spec.pdf
ls docs/v1/P4Runtime-Spec.html
- name: Upload spec to S3
uses: jakejarvis/s3-sync-action@v0.5.1
with:
Expand All @@ -30,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:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Emacs
*~
docs/v1/build/
docs/v1/
.DS_Store
build
dist
Expand Down
2 changes: 1 addition & 1 deletion docs/v1/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading