remove submodule
diff --git a/.github/workflows/auto_update_submodule.yml b/.github/workflows/auto_update_submodule.yml deleted file mode 100644 index 7219ddf..0000000 --- a/.github/workflows/auto_update_submodule.yml +++ /dev/null
@@ -1,41 +0,0 @@ - -name: 'Auto-update Submodules' - -on: - workflow_dispatch: - schedule: - - cron: "0 0 * * *" - -jobs: - sync: - name: 'Auto-update Submodules' - runs-on: ubuntu-latest - - # Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest - defaults: - run: - shell: bash - - steps: - # Checkout the repository to the GitHub Actions runner - - name: Checkout - uses: actions/checkout@v2 - with: - submodules: true - - # Git config - - name: Git Configurations - run: | - git config --global user.name 'Git bot' - git config --global user.email 'bot@noreply.github.com' - - # Update references - - name: Git Sumbodule Update - run: | - git submodule update --init --recursive - git submodule update --remote --recursive - - - name: Commit update - run: | - git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} - git commit -am "Auto updated submodule references" && git push || echo "No changes to commit"
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index c73b442..0000000 --- a/.gitmodules +++ /dev/null
@@ -1,3 +0,0 @@ -[submodule "caravel-lite"] - path = caravel - url = https://github.com/efabless/caravel-lite
diff --git a/Makefile b/Makefile index d97988b..226f016 100644 --- a/Makefile +++ b/Makefile
@@ -23,17 +23,14 @@ ifeq ($(CARAVEL_LITE),1) CARAVEL_NAME := caravel-lite - CARAVEL_REPO := https://github.com/efabless/caravel-lite - CARAVEL_BRANCH := main + CARAVEL_REPO := https://github.com/efabless/caravel_openframe-lite + CARVEL_TAG := 'rc-8' else CARAVEL_NAME := caravel - CARAVEL_REPO := https://github.com/efabless/caravel - CARAVEL_BRANCH := master + CARAVEL_REPO := https://github.com/efabless/caravel_openframe + CARVEL_TAG := 'rc-8' endif -# Install caravel as submodule, (1): submodule, (0): clone -SUBMODULE?=1 - # Include Caravel Makefile Targets .PHONY: % : check-caravel %: @@ -72,19 +69,8 @@ # Install caravel .PHONY: install install: -ifeq ($(SUBMODULE),1) - @echo "Installing $(CARAVEL_NAME) as a submodule.." -# Convert CARAVEL_ROOT to relative path because .gitmodules doesn't accept '/' - $(eval CARAVEL_PATH := $(shell realpath --relative-to=$(shell pwd) $(CARAVEL_ROOT))) - @if [ ! -d $(CARAVEL_ROOT) ]; then git submodule add --name $(CARAVEL_NAME) $(CARAVEL_REPO) $(CARAVEL_PATH); fi - @git submodule update --init - @cd $(CARAVEL_ROOT); git checkout $(CARAVEL_BRANCH) - $(MAKE) simlink -else @echo "Installing $(CARAVEL_NAME).." - @git clone $(CARAVEL_REPO) $(CARAVEL_ROOT) - @cd $(CARAVEL_ROOT); git checkout $(CARAVEL_BRANCH) -endif + @git clone -b $(CARVEL_TAG) $(CARAVEL_REPO) $(CARAVEL_ROOT) # Create symbolic links to caravel's main files .PHONY: simlink @@ -98,30 +84,12 @@ # Update Caravel .PHONY: update_caravel update_caravel: check-caravel -ifeq ($(SUBMODULE),1) - @git submodule update --init --recursive - cd $(CARAVEL_ROOT) && \ - git checkout $(CARAVEL_BRANCH) && \ - git pull -else - cd $(CARAVEL_ROOT)/ && \ - git checkout $(CARAVEL_BRANCH) && \ - git pull -endif + cd $(CARAVEL_ROOT)/ && git checkout $(CARVEL_TAG) && git pull # Uninstall Caravel .PHONY: uninstall uninstall: -ifeq ($(SUBMODULE),1) - git config -f .gitmodules --remove-section "submodule.$(CARAVEL_NAME)" - git add .gitmodules - git submodule deinit -f $(CARAVEL_ROOT) - git rm --cached $(CARAVEL_ROOT) - rm -rf .git/modules/$(CARAVEL_NAME) rm -rf $(CARAVEL_ROOT) -else - rm -rf $(CARAVEL_ROOT) -endif # Install Openlane .PHONY: openlane