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.

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

[BOT] Update yosys #1997

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 dependencies/tool_metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
make install
- name: yosys
repo: https://github.com/YosysHQ/yosys
commit: 14d50a176d59a5eac95a57a01f9e933297251d5b
commit: d21c464ae4212abc8a413ecd12c3c1bdc04fb100
build: |
make clean
make PREFIX=$PREFIX config-gcc
Expand Down
6 changes: 4 additions & 2 deletions docker/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ def get_tag_for(os, arch=None):


@click.command()
@click.option("-R", "--registry", default="docker.io")
@click.option("-r", "--repository", required=True)
@click.option(
"-o",
Expand All @@ -177,7 +178,7 @@ def get_tag_for(os, arch=None):
type=click.Choice(SUPPORTED_OPERATING_SYSTEMS),
)
@click.argument("tools", nargs=-1)
def process_dockerfile_tpl(repository, operating_system, tools):
def process_dockerfile_tpl(registry, repository, operating_system, tools):
image_tags = [
(
subprocess.check_output(
Expand All @@ -197,7 +198,8 @@ def process_dockerfile_tpl(repository, operating_system, tools):
image_names = [f"{repository}:{tag}" for tag in image_tags]

from_lines = [
f"FROM {name}-${{ARCH}} as container{i}" for i, name in enumerate(image_names)
f"FROM {registry}/{name}-${{ARCH}} as container{i}"
for i, name in enumerate(image_names)
]

copy_lines = [
Expand Down
Loading