Merge pull request #13 from efabless/caravel_openframe remove submodule
diff --git a/.github/scripts/build/run-set-id.sh b/.github/scripts/build/run-set-id.sh index b6e9cfb..9cb87f8 100644 --- a/.github/scripts/build/run-set-id.sh +++ b/.github/scripts/build/run-set-id.sh
@@ -24,7 +24,7 @@ cd $UPRJ_ROOT # Install full version of caravel -git clone https://github.com/efabless/caravel --branch develop --depth 1 $CARAVEL_ROOT +git clone https://github.com/efabless/caravel --depth 1 $CARAVEL_ROOT LOG_FILE=out.log docker run -v $UPRJ_ROOT:$UPRJ_ROOT -v $PDK_ROOT:$PDK_ROOT -v $CARAVEL_ROOT:$CARAVEL_ROOT -e UPRJ_ROOT=$UPRJ_ROOT -e PDK_ROOT=$PDK_ROOT -e CARAVEL_ROOT=$CARAVEL_ROOT -u $(id -u $USER):$(id -g $USER) $IMAGE_NAME bash -c "cd $CARAVEL_ROOT; make uncompress; cd $UPRJ_ROOT; export USER_ID=$USER_ID; make set_user_id | tee $LOG_FILE;" @@ -35,4 +35,4 @@ exit 2; fi -exit 0 \ No newline at end of file +exit 0
diff --git a/.github/scripts/build/run-truck.sh b/.github/scripts/build/run-truck.sh index 84f183b..2318fbf 100644 --- a/.github/scripts/build/run-truck.sh +++ b/.github/scripts/build/run-truck.sh
@@ -23,7 +23,7 @@ cd $UPRJ_ROOT # Install full version of caravel -git clone https://github.com/efabless/caravel --branch develop --depth 1 $CARAVEL_ROOT +git clone https://github.com/efabless/caravel --depth 1 $CARAVEL_ROOT docker run -v $UPRJ_ROOT:$UPRJ_ROOT -v $PDK_ROOT:$PDK_ROOT -v $CARAVEL_ROOT:$CARAVEL_ROOT -e UPRJ_ROOT=$UPRJ_ROOT -e PDK_ROOT=$PDK_ROOT -e CARAVEL_ROOT=$CARAVEL_ROOT -u $(id -u $USER):$(id -g $USER) $IMAGE_NAME bash -c "cd $CARAVEL_ROOT; make uncompress; cd $UPRJ_ROOT; make truck;"
diff --git a/.github/workflows/user_project_ci.yml b/.github/workflows/user_project_ci.yml index ff32238..49b8d92 100644 --- a/.github/workflows/user_project_ci.yml +++ b/.github/workflows/user_project_ci.yml
@@ -32,8 +32,6 @@ runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - with: - submodules: 'true' - name: Set up QEMU uses: docker/setup-qemu-action@v1