Skip to content

Commit 8cb15b6

Browse files
committed
separate install-frigate and install-repos
Signed-off-by: Kareem Farid <[email protected]>
1 parent 6fe0a96 commit 8cb15b6

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.github/actions/setup-dependencies/action.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ runs:
2828
# path: ${{env.FRIGATE_ROOT}}
2929
# key: FRIGATE-${{env.FRIGATE_BRANCH}}
3030
# enableCrossOsArchive: "true"
31+
- name: Install frigate
32+
shell: bash
33+
run: make install-frigate
3134
- name: Cache mgmt
3235
id: cache-mgmt
3336
uses: actions/cache/restore@v4
@@ -61,7 +64,6 @@ runs:
6164
run: |
6265
mkdir -p ${{ env.PDK_ROOT }}
6366
make pdk-with-volare
64-
cd ${{ env.PDK_ROOT }}
6567
# - name: Save Cache FRIGATE
6668
# if: ${{ steps.cache-FRIGATE.outputs.cache-hit != 'true' }}
6769
# uses: actions/cache/save@v4

Makefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export PDK?=sky130A
3434
export PDKPATH?=$(PDK_ROOT)/$(PDK)
3535

3636
.PHONY: setup
37-
setup: check_dependencies install-frigate pdk-with-volare setup-cocotb
37+
setup: check_dependencies install-frigate install-frigate-repos pdk-with-volare setup-cocotb
3838

3939

4040
.PHONY: check_dependencies
@@ -59,6 +59,10 @@ install-volare:
5959
./venv/bin/$(PYTHON_BIN) -m pip install --upgrade --no-cache-dir pip
6060
./venv/bin/$(PYTHON_BIN) -m pip install --upgrade --no-cache-dir volare
6161

62+
.PHONY: install-frigate-repos
63+
install-frigate-repos: install-frigate
64+
make install-repos -C $(FRIGATE_ROOT)
65+
6266
# Include frigate
6367
.PHONY: install-frigate
6468
install-frigate:
@@ -67,14 +71,9 @@ install-frigate:
6771
echo "Updating $(FRIGATE_ROOT)"; \
6872
cd $(FRIGATE_ROOT) && \
6973
git checkout $(FRIGATE_BRANCH) && git pull && \
70-
make install-repos; \
71-
cd "$$MAKE_DIR"; \
7274
else \
7375
echo "Cloning $(FRIGATE_REPO_URL) -b $(FRIGATE_BRANCH)"; \
7476
git clone -b $(FRIGATE_BRANCH) $(FRIGATE_REPO_URL) $(FRIGATE_ROOT) --depth=1 --single-branch; \
75-
cd $(FRIGATE_ROOT) && \
76-
make install-repos; \
77-
cd "$$MAKE_DIR"; \
7877
fi
7978

8079
dv_patterns=$(shell cd verilog/dv && find * -maxdepth 0 -type d)

0 commit comments

Comments
 (0)