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

CI: workaround for push issue #57

Closed
wants to merge 3 commits into from
Closed

CI: workaround for push issue #57

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1ebc1a
CI: workaround for push issue
junghans Feb 3, 2025
65674b7
CI: add better comment
junghans Feb 4, 2025
b59c25c
Update continuous-integration-workflow.yml
junghans Feb 5, 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
6 changes: 4 additions & 2 deletions .github/workflows/continuous-integration-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
docker-tag: ghcr.io/kokkos/ci-containers/${{ matrix.config.dockerfile }}:${{ matrix.config.tag }}
runs-on: ubuntu-latest
steps:
- name: Checkout CI repo
uses: actions/checkout@v4
Copy link
Member

Choose a reason for hiding this comment

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

Why did we add this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Now we need to checkout the Dockerfiles as we modify them below. Previously the docker action did that for us automatically.

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
Expand Down Expand Up @@ -75,11 +77,11 @@ jobs:
-DKokkos_ENABLE_OPENMP=ON && \
cmake --build builddir --parallel 2 && \
ctest --test-dir builddir --output-on-failure"
sed -i '26s/$/ /' ${{ matrix.config.dockerfile }} # workaround for kokkos/ci-containers#56
Copy link
Member

Choose a reason for hiding this comment

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

What is that doing and why is it needed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

As a workaround we are adding a space to the end of the line to force docker to "rebuild" line 26 and later commands.

- name: Push the image into GitHub Container Registry
uses: docker/build-push-action@v6
if: ${{ github.repository_owner == 'kokkos' && ( github.event_name == 'push' || github.event_name == 'schedule' ) }}
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

We could discuss to add this back, the step is relatively cheap except for the intel container and I prefer to run the whole CI as part of any PR.

with:
tags: ${{ env.docker-tag }}
file: ${{ matrix.config.dockerfile }}
build-args: ${{ steps.build_args.outputs.args }}
push: true
push: ${{ github.repository_owner == 'kokkos' && ( github.event_name == 'push' || github.event_name == 'schedule' ) }}
Loading