Skip to content
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

Fixes space for p4lang/p4rt-asciidoc #536

Merged
merged 2 commits into from
Jan 24, 2025
Merged

Fixes space for p4lang/p4rt-asciidoc #536

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a56ca55
Fixes space for p4lang/p4rt-asciidoc
Dscano Jan 21, 2025
6f14ad7
Add docker creation
Dscano Jan 21, 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
2 changes: 1 addition & 1 deletion .github/workflows/any-branch-uploads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- name: Build spec
run: |
docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc :latest make
docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc:latest make
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dscano I believe you need to build the dockerfile before you docker run ... in all the CI scripts, or it'll fail to find the image. This is similar to what you had to do in the original MR:

p4runtime/.github/workflows/spec.yml

Line 28 in 7e981d8

make -C docs/tools/

It's a consequence of not having a public docker image. Unfortunately, this is not exposed until CI runs after the merge occurs. Can you make sure this is added to all the CI files accordingly? Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

ls docs/v1/build
- name: Upload spec to S3 if needed
if: ${{ github.actor != 'dependabot[bot]' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-branch-uploads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0
- name: Build spec
run: |
docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc :latest make
docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc:latest make
ls docs/v1/build
- name: Upload spec to S3
uses: jakejarvis/s3-sync-action@v0.5.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-uploads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fetch-depth: 0
- name: Build spec
run: |
docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc :latest make
docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc:latest make
ls docs/v1/build
- name: Upload spec to S3
uses: jakejarvis/s3-sync-action@v0.5.1
Expand Down
Loading