Skip to content

Commit ff5509f

Browse files
committed
hotfix: fix venv target, ci docker pushes
Signed-off-by: Mohamed Gaber <[email protected]>
1 parent b729aa5 commit ff5509f

File tree

10 files changed

+18
-66
lines changed

10 files changed

+18
-66
lines changed

.github/workflows/lint.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/openlane_ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -291,18 +291,18 @@ jobs:
291291
run: |
292292
echo "TAG_LIST=" >> $GITHUB_ENV
293293
294-
- name: Docker Tag (Main Branch Hashes)
295-
if: ${{ env.PUSHING == '1' && github.event_name == 'push' && env.BRANCH_NAME == env.MAIN_BRANCH }}
296-
run: |
297-
echo "TAG_LIST=$TAG_LIST ${{ env.GIT_COMMIT_HASH }}" >> $GITHUB_ENV
298-
299294
- name: Docker Tag (Branches)
300295
if: ${{ env.PUSHING == '1' && github.event_name == 'push' }}
301296
run: |
302297
echo "TAG_LIST=$TAG_LIST ${{ env.BRANCH_NAME }}" >> $GITHUB_ENV
303298
304-
- name: Docker Push (Version Tag/Latest)
305-
if: ${{ env.PUSHING == '1' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && env.NEW_TAG != 'NO_NEW_TAG' }}
299+
- name: Docker Tag (Main Branch Hashes)
300+
if: ${{ env.PUSHING == '1' && github.event_name == 'push' && env.BRANCH_NAME == vars.MAIN_BRANCH }}
301+
run: |
302+
echo "TAG_LIST=$TAG_LIST ${{ env.GIT_COMMIT_HASH }}" >> $GITHUB_ENV
303+
304+
- name: Docker Push (Main Branch Tags/Latest)
305+
if: ${{ env.PUSHING == '1' && github.event_name == 'push' && env.BRANCH_NAME == vars.MAIN_BRANCH && env.NEW_TAG != '' }}
306306
run: |
307307
echo "TAG_LIST=$TAG_LIST ${{ env.NEW_TAG }} latest" >> $GITHUB_ENV
308308

CONTRIBUTING.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ Please do not write new shell scripts, no matter how trivial.
1818
### Python
1919
Python code should run on Python 3.6+.
2020

21-
You will need to ensure that your Python code passes linting with the tools and plugins in [`requirements_lint.txt`](https://github.com/The-OpenROAD-Project/OpenLane/tree/master/requirements_lint.txt). The commands are simply `black .` and `flake8 .`. Please fix all warnings.
22-
23-
For new code, please follow [PEP-8 naming conventions](https://peps.python.org/pep-0008/#naming-conventions). The linters do not enforce them just yet because of the corpus of existing code that does not do that, but they will in the future.
24-
2521
Do all arithmetic either in integers or using the Python [`decimal`](https://docs.python.org/3.6/library/decimal.html) library. All (numerous) existing uses of IEEE-754 are bugs we are interested in fixing.
2622

2723
## Yosys, OpenROAD and Magic Scripts
@@ -49,4 +45,4 @@ For a PR to be merged, there are two requirements:
4945
## Licensing and Copyright
5046
Please add you (or your employer's) copyright headers to any files to which you have made major edits.
5147

52-
Please note all code contributions must have the same license as OpenLane, i.e., the Apache License, version 2.0.
48+
Please note all code contributions must have the same license as OpenLane, i.e., the Apache License, version 2.0.

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,19 @@ ENV_COMMAND = $(ENV_START) $(OPENLANE_IMAGE_NAME)-$(DOCKER_ARCH)
9191
all: get-openlane pdk
9292

9393
.PHONY: openlane
94-
openlane: venv/created
94+
openlane: venv/manifest.txt
9595
@PYTHON_BIN=$(PWD)/venv/bin/$(PYTHON_BIN) $(MAKE) -C docker openlane
9696

9797
.PHONY: openlane-and-push-tools
9898
openlane-and-push-tools: venv/created
9999
@PYTHON_BIN=$(PWD)/venv/bin/$(PYTHON_BIN) BUILD_IF_CANT_PULL=1 BUILD_IF_CANT_PULL_THEN_PUSH=1 $(MAKE) -C docker openlane
100100

101-
pull-openlane:
102-
@docker pull "$(OPENLANE_IMAGE_NAME)"
103-
104101
get-openlane:
105102
@$(MAKE) pull-openlane || $(MAKE) openlane
106103

104+
pull-openlane:
105+
@docker pull "$(OPENLANE_IMAGE_NAME)"
106+
107107
.PHONY: mount
108108
mount:
109109
cd $(OPENLANE_DIR) && \
@@ -128,11 +128,11 @@ start-build-env: venv/manifest.txt
128128
bash -c "bash --rcfile <(cat ~/.bashrc ./venv/bin/activate)"
129129

130130
venv: venv/manifest.txt
131-
venv/manifest.txt: ./requirements.txt ./requirements_dev.txt ./requirements_lint.txt ./dependencies/python/precompile_time.txt ./dependencies/python/run_time.txt
131+
venv/manifest.txt: ./requirements.txt ./dependencies/python/precompile_time.txt ./dependencies/python/run_time.txt
132132
rm -rf ./venv
133133
$(PYTHON_BIN) -m venv ./venv
134134
PYTHONPATH= ./venv/bin/$(PYTHON_BIN) -m pip install --upgrade --no-cache-dir pip
135-
PYTHONPATH= ./venv/bin/$(PYTHON_BIN) -m pip install --upgrade --no-cache-dir -r ./requirements_dev.txt
135+
PYTHONPATH= ./venv/bin/$(PYTHON_BIN) -m pip install --upgrade --no-cache-dir -r ./requirements.txt
136136
PYTHONPATH= ./venv/bin/$(PYTHON_BIN) -m pip freeze > $@
137137

138138
DLTAG=custom_design_List

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ The versions of OpenLane currently being offered and supported are currently
44
versions 1.0.X, as they were used for countless tape outs for the Google MPW and
55
Efabless chipIgnite shuttles. Only critical bugfixes will be merged at this
66
point. The intent is that tape-outs on older shuttles may be reproduced.
7+
**OpenLane is not recommended for new projects or designs.**
78

8-
For all newer designs, kindly check out the successor to the OpenLane flow,
9-
the LibreLane flow infrastructure (which is backwards-compatible.)
9+
For new designs, kindly check out the successor to the OpenLane flow, the
10+
LibreLane flow infrastructure (which is backwards-compatible.)
1011

1112
<p align="center">
1213
<a href="https://github.com/librelane/librelane"><img src="./docs/_static/librelane_banner.svg" width="80%" alt="LibreLane: Meet the successor to OpenLane — community-driven and rewritten from scratch with a modular architecture. Configure your designs using one file just like OpenLane, or use Python to implement advanced flows."></a>

docs/source/for_developers/gha_workflow.md

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,4 @@ There are two primary flows: the pull request flow and the deployment flow.
55

66
The deployment flow occurs on each push, with an extended test set nightly. The PR flow happens whenever someone creates a new Pull Request. PRs can be created by contributors or by an automated tool updater that runs on a schedule.
77

8-
* A maintainer cannot review their own code, but they can merge it after a review by another maintainer.
9-
10-
## Required Secrets/Variables
11-
Repository secrets are used to protect certain credentials, while variables are repository-dependent parameters for the CI.
12-
13-
### Common
14-
| Variable | Description |
15-
|---------------|---------------------------------------------------------------|
16-
| `MAIN_BRANCH` | The main branch for OpenLane. Format: `main`|`master`|`etc` |
17-
18-
| Secret | Description |
19-
|---------------|---------------------------------------------------------------|
20-
| `BOT_TOKEN` | A GitHub token for a bot account that is able to create new tags on this repository. |
21-
22-
### CI
23-
| Variable | Description |
24-
|---------------|
25-
| `DOCKER_IMAGE` | The name of the resulting Docker image (minus the tag). In our case, we use `ghcr.io/the-openroad-project/openlane`. |
26-
| `TOOL_DOCKER_IMAGE` | The name of the resulting Docker images for tools (minus the tag). In our case, we use `ghcr.io/the-openroad-project/openlane-tools`. |
8+
* A maintainer cannot review their own code, but they should merge it after a review by another maintainer.

requirements_dev.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

requirements_lint.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)