Skip to content

Commit

Permalink
squash-me, move new files under ci/cached-builds/
Browse files Browse the repository at this point in the history
  • Loading branch information
jiridanek committed Jun 5, 2024
1 parent 27dc95b commit 23911fb
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-notebooks-TEMPLATE.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
- name: Configure Podman
run: |
mkdir -p $HOME/.config/containers/
cp ci/containers.conf $HOME/.config/containers/containers.conf
cp ci/storage.conf $HOME/.config/containers/storage.conf
cp ci/cached-builds/containers.conf $HOME/.config/containers/containers.conf
cp ci/cached-builds/storage.conf $HOME/.config/containers/storage.conf
# should at least reset storage when touching storage.conf
sudo mkdir -p /mnt/containers/
sudo chown -R $USER:$USER /mnt/containers
Expand All @@ -79,8 +79,8 @@ jobs:
run: |
# start a black hole container registry as make target always does a push
mkdir -p $HOME/.config/containers/registries.conf.d/
cp ci/insecure_localhost_registry.conf $HOME/.config/containers/registries.conf.d/insecure_localhost_registry.conf
go run ci/dev_null_container_registry.go &
cp ci/cached-builds/insecure_localhost_registry.conf $HOME/.config/containers/registries.conf.d/insecure_localhost_registry.conf
go run ci/cached-builds/dev_null_container_registry.go &
# build and push the image
make ${{ inputs.target }}
if: "${{ fromJson(inputs.github).event_name == 'pull_request' }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-notebooks-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
matrix: ${{ steps.gen.outputs.matrix }}
steps:
- uses: actions/checkout@v4
- run: python3 ci/gen_gha_matrix_jobs.py
- run: python3 ci/cached-builds/gen_gha_matrix_jobs.py
id: gen

# base images
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-notebooks.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# This file is autogenerated by ci/gen_gha_matrix_jobs.py
# This file is autogenerated by ci/cached-builds/gen_gha_matrix_jobs.py
{
"name": "Build Notebooks",
"permissions": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-quality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v4

- name: Rerun all code generators we have
run: python3 ci/gen_gha_matrix_jobs.py
run: python3 ci/cached-builds/gen_gha_matrix_jobs.py

- name: Check there aren't any modified files present
run: |
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
The parsing is not able to handle general Makefiles, it only works with the Makefile in this project.
Use https://pypi.org/project/py-make/ or https://github.com/JetBrains/intellij-plugins/tree/master/makefile/grammars if you look for general parser."""

project_dir = pathlib.Path(__file__).parent.parent.absolute()
project_dir = pathlib.Path(__file__).parent.parent.parent.absolute()


def read_makefile_lines(lines: Iterable[str]) -> list[str]:
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 23911fb

Please sign in to comment.